diff --git a/app-admin/eselect-awk/Manifest b/app-admin/eselect-awk/Manifest
new file mode 100644
index 000000000000..e152716209d3
--- /dev/null
+++ b/app-admin/eselect-awk/Manifest
@@ -0,0 +1 @@
+DIST eselect-awk-0.2.tar.gz 1541 RMD160 6ff0f471498f18e52a36c092aefa876da04c353d SHA1 dc7c741b24e2b7f6cfcf0676d0903479ff7c7ee5 SHA256 e126c0d04bad2d374c92725e54184e78b8e60f3922440186096d333148cebcf0
diff --git a/app-admin/eselect-awk/eselect-awk-0.2.ebuild b/app-admin/eselect-awk/eselect-awk-0.2.ebuild
new file mode 100644
index 000000000000..d043758da2ff
--- /dev/null
+++ b/app-admin/eselect-awk/eselect-awk-0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.1 2012/06/04 03:07:33 ottxor Exp $
+
+EAPI=4
+
+DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins awk.eselect
+}
diff --git a/app-admin/eselect-awk/metadata.xml b/app-admin/eselect-awk/metadata.xml
new file mode 100644
index 000000000000..6ce7863fe532
--- /dev/null
+++ b/app-admin/eselect-awk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<herd>base-system</herd>
+</pkgmetadata>
diff --git a/app-admin/eselect-boost/eselect-boost-0.4.ebuild b/app-admin/eselect-boost/eselect-boost-0.4.ebuild
index bfdc5b071579..f56444d77c77 100644
--- a/app-admin/eselect-boost/eselect-boost-0.4.ebuild
+++ b/app-admin/eselect-boost/eselect-boost-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-boost/eselect-boost-0.4.ebuild,v 1.7 2012/05/21 09:34:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-boost/eselect-boost-0.4.ebuild,v 1.8 2012/06/03 16:25:50 armin76 Exp $
 
 inherit multilib
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-rails/eselect-rails-0.18.ebuild b/app-admin/eselect-rails/eselect-rails-0.18.ebuild
index ccd7f5dbab20..3aa51b0754a2 100644
--- a/app-admin/eselect-rails/eselect-rails-0.18.ebuild
+++ b/app-admin/eselect-rails/eselect-rails-0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.18.ebuild,v 1.2 2012/01/01 17:23:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.18.ebuild,v 1.3 2012/06/04 09:53:38 ago Exp $
 
 DESCRIPTION="Manages Ruby on Rails symlinks"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/ruby-team/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~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="amd64 ~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=">=app-admin/eselect-1.2.0"
diff --git a/app-admin/logcheck/logcheck-1.3.14.ebuild b/app-admin/logcheck/logcheck-1.3.14.ebuild
index 57bd2fd6d08e..2d348991f7fc 100644
--- a/app-admin/logcheck/logcheck-1.3.14.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.5 2012/05/31 02:32:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.6 2012/06/04 02:15:38 xmw Exp $
 
 inherit eutils user
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-arch/lzip/lzip-1.13.ebuild b/app-arch/lzip/lzip-1.13.ebuild
index bcb1db31411a..64c9b0ca0679 100644
--- a/app-arch/lzip/lzip-1.13.ebuild
+++ b/app-arch/lzip/lzip-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.13.ebuild,v 1.1 2012/03/19 05:47:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.13.ebuild,v 1.2 2012/06/03 19:31:21 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/rpm/rpm-4.9.1.3.ebuild b/app-arch/rpm/rpm-4.9.1.3.ebuild
index 7eca9d771d27..a4907f7d967a 100644
--- a/app-arch/rpm/rpm-4.9.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.9.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.2 2012/06/02 13:37:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.4 2012/06/04 09:11:00 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="nls python doc caps lua acl"
 
diff --git a/app-backup/deja-dup/deja-dup-22.1.ebuild b/app-backup/deja-dup/deja-dup-22.1.ebuild
index 7a5119c29342..0f5ec8cf951b 100644
--- a/app-backup/deja-dup/deja-dup-22.1.ebuild
+++ b/app-backup/deja-dup/deja-dup-22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.1.ebuild,v 1.4 2012/05/05 15:24:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.1.ebuild,v 1.5 2012/06/04 09:52:28 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/22/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nautilus"
 
 RESTRICT="test"
diff --git a/app-benchmarks/i7z/i7z-0.27.1.ebuild b/app-benchmarks/i7z/i7z-0.27.1.ebuild
index 7657e620fc97..c04ce48c345b 100644
--- a/app-benchmarks/i7z/i7z-0.27.1.ebuild
+++ b/app-benchmarks/i7z/i7z-0.27.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.1.ebuild,v 1.1 2011/12/28 22:32:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.1.ebuild,v 1.2 2012/06/04 09:52:49 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-cdr/cdw/cdw-0.7.1.ebuild b/app-cdr/cdw/cdw-0.7.1.ebuild
index d7ba4c16a1ea..7dca13d0c3de 100644
--- a/app-cdr/cdw/cdw-0.7.1.ebuild
+++ b/app-cdr/cdw/cdw-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.7.1.ebuild,v 1.2 2012/05/31 06:21:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.7.1.ebuild,v 1.3 2012/06/03 23:17:35 hwoarang Exp $
 
 EAPI=2
 inherit autotools flag-o-matic eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/cdrtools
diff --git a/app-editors/gobby/gobby-0.4.13.ebuild b/app-editors/gobby/gobby-0.4.13.ebuild
index b5de94417d3c..bee7a2c229ae 100644
--- a/app-editors/gobby/gobby-0.4.13.ebuild
+++ b/app-editors/gobby/gobby-0.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/gobby-0.4.13.ebuild,v 1.2 2012/05/03 18:33:01 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/gobby-0.4.13.ebuild,v 1.3 2012/06/03 19:29:41 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gobby.0x539.de/"
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="avahi gnome"
 
 RDEPEND="dev-cpp/glibmm:2
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
index 040fea1c6209..2b373fc21313 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild,v 1.4 2012/06/02 10:35:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild,v 1.5 2012/06/03 18:27:09 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8922c41eb675..757195831c96 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,5 @@
 DIST libvirt-0.9.10-bp-1.tar.bz2 4359 RMD160 1b064c56007001f509cd0e940ec337d6281b19bb SHA1 ba11fd52aec15fb80e461a1fbc49c142e58ed3b5 SHA256 038791b47489a831718f98ba9cdf77cff88a6e26003f81a0c2f11581f0bde4a3
 DIST libvirt-0.9.10.tar.gz 19085438 RMD160 8f103b176fc7b943a88cf7196709865edc5db5e8 SHA1 cf32d6bea295cb30461901d987f049c9547ff1e8 SHA256 5b81d9f054ee4b395b0ab4f59845d082baaa6d6c2a038c966309156dde16e11d
 DIST libvirt-0.9.11.3.tar.gz 19615688 RMD160 dcfb5c7e9bd5a35d08c8940f3e24164f71a04276 SHA1 2bcb00a901113f53fb5eb3fd2d2a3b3e68dcc0f4 SHA256 aa73b329d2f6eb200991b9dc378d4636c15cd2f95ca224995d01b45257584fa2
+DIST libvirt-0.9.12.tar.gz 20054618 RMD160 16b38dc2e2f5df9b427ca89ab8c1fb25b63e17e1 SHA1 3743dc4f3e58d5912a98f568c3e854d97d81f216 SHA256 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
diff --git a/app-emulation/libvirt/libvirt-0.9.11.3.ebuild b/app-emulation/libvirt/libvirt-0.9.11.3.ebuild
index 0a4251b75d87..f59705e0e392 100644
--- a/app-emulation/libvirt/libvirt-0.9.11.3.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.3.ebuild,v 1.7 2012/05/31 22:56:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.3.ebuild,v 1.8 2012/06/04 06:56:04 cardoe Exp $
 
 EAPI=4
 
@@ -62,7 +62,7 @@ RDEPEND="sys-libs/readline
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
 	iscsi? ( sys-block/open-iscsi )
-	libvirtd? ( net-misc/bridge-utils )
+	lxc? ( sys-power/pm-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	nfs? ( net-fs/nfs-utils )
 	numa? ( >sys-process/numactl-2.0.2 )
@@ -74,8 +74,11 @@ RDEPEND="sys-libs/readline
 	pcap? ( >=net-libs/libpcap-1.0.0 )
 	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
-		dev-libs/yajl )
+	qemu? ( 
+		|| ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
diff --git a/app-emulation/libvirt/libvirt-0.9.12.ebuild b/app-emulation/libvirt/libvirt-0.9.12.ebuild
new file mode 100644
index 000000000000..7d071f38cfbb
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.9.12.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.12.ebuild,v 1.1 2012/06/04 07:59:24 cardoe Exp $
+
+EAPI=4
+
+#BACKPORTS=1
+#AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+fi
+
+PYTHON_DEPEND="python? 2:2.5"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python user autotools
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="avahi +caps debug iscsi +libvirtd lvm +lxc macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
+	uml virtualbox virt-network xen elibc_glibc"
+# IUSE=one : bug #293416 & bug #299011
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
+	virtualbox? ( libvirtd ) xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( sys-power/pm-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( >sys-process/numactl-2.0.2 )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	phyp? ( net-libs/libssh2 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? ( 
+		|| ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal] )
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	myconf="${myconf} $(use_enable debug)"
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	 # leave it automagic as it depends on the version of xen used.
+	use xen || myconf+=" --without-libxl"
+
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	# doesn't belong with hypervisors but links to libvirtd for some reason
+	#myconf="${myconf} $(use_with one)"
+
+	## hypervisor protocols
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with virt-network network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	#myconf="${myconf} --without-storage-rbd"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} --without-numad"
+	myconf="${myconf} $(use_with selinux)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network bits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf --without-audit"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF}/python \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${FILESDIR}/libvirtd.init-r8" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
+
+	keepdir /var/lib/libvirt/images
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	mv "${D}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize libvirt.py
+
+	# support for dropped privileges
+	fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
+	fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	else
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
+	elog
+	if has_version net-dns/dnsmasq; then
+		ewarn "If you have a DNS server setup on your machine, you will have"
+		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+		ewarn " bind-interfaces"
+		ewarn " interface or except-interface"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup libvirt.py
+}
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 41a5f91b9218..b1c29e10e669 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1 +1,2 @@
 DIST q4wine-0.121.tar.bz2 665208 RMD160 283af7d244c46827159d3a01cf8db8ed5463b605 SHA1 f7e3d2a166dac561330259e51cb9c355fa8908c0 SHA256 fc5a1a8c09d133a17a997a2b020ad03eaf06c81357863d9f69fd7206d86e3edc
+DIST q4wine-0.999-rc7.tar.bz2 865925 RMD160 77c0c1f715b8dce0f9b83cc5abed6f887069ac6e SHA1 9133c7d0e3dd54a38e7b64edf22389aeac16a056 SHA256 7e6c87e088a9f8b07e105e49b7ed46fd431a26ae379ff9f58571e8318c7abf69
diff --git a/app-emulation/q4wine/q4wine-0.999_rc7.ebuild b/app-emulation/q4wine/q4wine-0.999_rc7.ebuild
new file mode 100644
index 000000000000..52a0381bbd7f
--- /dev/null
+++ b/app-emulation/q4wine/q4wine-0.999_rc7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-0.999_rc7.ebuild,v 1.1 2012/06/03 18:57:02 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de en es he it ru uk pl pt"
+
+inherit cmake-utils
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Qt4 GUI configuration tool for Wine"
+HOMEPAGE="http://q4wine.brezblock.org.ua/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +icoutils +wineappdb -dbus gnome kde"
+
+for x in ${LANGS}; do
+	IUSE+=" linguas_${x}"
+done
+
+DEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[sqlite]
+	dev-util/cmake"
+
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql:4[sqlite]
+	app-admin/sudo
+	app-emulation/wine
+	>=sys-apps/which-2.19
+	icoutils? ( >=media-gfx/icoutils-0.26.0 )
+	sys-fs/fuseiso
+	kde? ( kde-base/kdesu )
+	gnome? ( x11-libs/gksu )
+	dbus? ( x11-libs/qt-dbus:4 )"
+
+DOCS="README AUTHORS ChangeLog"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs} \
+		$(cmake-utils_use debug DEBUG) \
+		$(cmake-utils_use_with icoutils ICOUTILS) \
+		$(cmake-utils_use_with wineappdb WINEAPPDB) \
+		$(cmake-utils_use_with dbus DBUS)"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
+		fi
+	done
+}
diff --git a/app-misc/astrolog/astrolog-5.40-r1.ebuild b/app-misc/astrolog/astrolog-5.40-r1.ebuild
index 0e60bf858bea..4d398a7583c1 100644
--- a/app-misc/astrolog/astrolog-5.40-r1.ebuild
+++ b/app-misc/astrolog/astrolog-5.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40-r1.ebuild,v 1.1 2012/04/04 07:37:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40-r1.ebuild,v 1.2 2012/06/04 09:51:35 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
 
 LICENSE="astrolog"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 536dafbdc585..12f534310d59 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -3,3 +3,4 @@ DIST ktoblzcheck-1.31.tar.gz 579302 RMD160 13fa133c919624c45c04cc723d3d033bf161d
 DIST ktoblzcheck-1.33.tar.gz 579013 RMD160 26b18b0aaf0a943e3c8de3b3c0a4ed131d2bc472 SHA1 66b0e38980151c2ba9f726ceb3377406636630c8 SHA256 ecebd9713f0ed9a81df7d77d32625d6955ca8323a8ea4e7aac639fbc7696ec6e
 DIST ktoblzcheck-1.37.tar.gz 551990 RMD160 8fb740173bbb5424bd73569d95ea2542eb04e715 SHA1 054b4dd434a80d95d33085ce042bf6c4b7a636db SHA256 34dd5fb09282ac27a8f7243d3c99ad620ef29addfedc5b81beb5fac0d0efcf49
 DIST ktoblzcheck-1.38.tar.gz 551222 RMD160 306047eb929f409ff0ec2b228fdf6a923297bcd0 SHA1 57ed5840dfb1a96c1cd479328010d1fcb4f8d566 SHA256 68e6f8fa137098005c5e5a349a40bc2da517c365e6c3618caaab77d41d7c1a2e
+DIST ktoblzcheck-1.39.tar.gz 547649 RMD160 8d343d44108e97a8c36c38879808be7d047a5ff9 SHA1 b88ae800ed4cf7a1b8547eb0104fc6663334716d SHA256 c7017be79b58d0b6c2e919877b7d320da5dcba92d558f36f437da34d9b2dcb41
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.39.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.39.ebuild
new file mode 100644
index 000000000000..14fcf521ae4c
--- /dev/null
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.39.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ktoblzcheck/ktoblzcheck-1.39.ebuild,v 1.1 2012/06/03 17:48:45 hanno Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.6"
+inherit python
+
+DESCRIPTION="Library to check account numbers and bank codes of German banks"
+HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python"
+
+RDEPEND="app-text/recode
+	sys-apps/gawk
+	sys-apps/grep
+	sys-apps/sed
+	|| ( net-misc/wget www-client/lynx )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6b"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	>py-compile
+}
+
+src_configure() {
+	econf $(use_enable python)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ktoblzcheck.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ktoblzcheck.py
+}
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
index d1546c83e368..afbce5d69788 100644
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild,v 1.1 2012/01/25 14:07:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild,v 1.2 2012/06/04 02:11:53 xmw Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="net-libs/liblockfile"
diff --git a/app-misc/muttprint/muttprint-0.73-r1.ebuild b/app-misc/muttprint/muttprint-0.73-r1.ebuild
index e3caba9bb27f..dc3c469aa888 100644
--- a/app-misc/muttprint/muttprint-0.73-r1.ebuild
+++ b/app-misc/muttprint/muttprint-0.73-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.73-r1.ebuild,v 1.1 2012/04/28 12:34:12 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.73-r1.ebuild,v 1.2 2012/06/03 21:36:53 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND="dev-lang/perl
diff --git a/app-misc/pysmssend/pysmssend-1.48.ebuild b/app-misc/pysmssend/pysmssend-1.48.ebuild
index 7343901a6c09..7a998ee16d9d 100644
--- a/app-misc/pysmssend/pysmssend-1.48.ebuild
+++ b/app-misc/pysmssend/pysmssend-1.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pysmssend/pysmssend-1.48.ebuild,v 1.1 2012/06/03 09:20:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pysmssend/pysmssend-1.48.ebuild,v 1.2 2012/06/04 08:42:04 ago Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -15,7 +15,7 @@ SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="qt4"
 
 DEPEND=">dev-python/mechanize-0.1.7b
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild
index ca94e56140ef..df69be00d282 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild,v 1.1 2012/06/03 08:26:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild,v 1.2 2012/06/03 22:47:40 dilfridge Exp $
 
 EAPI=4
 
@@ -60,5 +60,5 @@ src_compile() { :; }
 
 src_install() {
 	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
 }
diff --git a/app-shells/zsh/zsh-4.3.17.ebuild b/app-shells/zsh/zsh-4.3.17.ebuild
index 2ef57f69d7fa..9c6c976b2955 100644
--- a/app-shells/zsh/zsh-4.3.17.ebuild
+++ b/app-shells/zsh/zsh-4.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.17.ebuild,v 1.3 2012/05/31 08:47:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.17.ebuild,v 1.4 2012/06/03 18:19:44 maekke Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
diff --git a/app-text/acroread/acroread-9.5.1-r1.ebuild b/app-text/acroread/acroread-9.5.1-r1.ebuild
new file mode 100644
index 000000000000..9885d0ef7b7e
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.1-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1-r1.ebuild,v 1.2 2012/06/03 20:30:59 dilfridge Exp $
+
+EAPI=4
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
+SRC_FOOT=".tar.bz2"
+
+# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan de:deu fr:fra ja:jpn
+# asian fonts are handled separately
+LINGUA_LIST="en:enu"
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_enu${SRC_FOOT}"
+for ll in ${LINGUA_LIST} ; do
+	iuse_l="linguas_${ll/:*}"
+	src_l=${ll/*:}
+	IUSE="${IUSE} ${iuse_l}"
+	DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
+	SRC_URI="${SRC_URI}
+		${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+
+# asian fonts from separate package:
+IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+SRC_URI="${SRC_URI}
+	${DEFAULT_URI}"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip mirror"
+
+DEPEND="dev-util/bsdiff"
+
+# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
+RDEPEND="media-libs/fontconfig
+	x86? ( =dev-libs/openssl-0.9.8* )
+	cups? ( net-print/cups )
+	x86? ( x11-libs/gtk+:2 net-dns/libidn
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( www-client/firefox
+						www-client/firefox-bin
+						www-client/seamonkey ) ) )
+	amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
+	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
+	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
+	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
+	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
+
+QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
+
+QA_DT_HASH="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	opt/netscape/plugins/nppdf.so"
+
+QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# Actually, ahv segfaults when run standalone so presumably
+# it isn't intended for direct use - so the only launcher is
+# acroread after all.
+LAUNCHERS="Adobe/Reader9/bin/acroread"
+#	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
+
+# remove bundled libs to force use of system version, bug 340527
+REMOVELIBS="libcrypto libssl"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	has_multilib_profile && ABI="x86"
+}
+
+# Determine lingua from filename
+acroread_get_ll() {
+	local f_src_l ll lingua src_l
+	f_src_l=${1/${SRC_FOOT}}
+	f_src_l=${f_src_l/*_}
+	for ll in ${LINGUA_LIST} ; do
+		lingua=${ll/:*}
+		src_l=${ll/*:}
+		if [[ ${src_l} == ${f_src_l} ]] ; then
+			echo ${lingua}
+			return
+		fi
+	done
+	die "Failed to match file $1 to a LINGUA; please report."
+}
+
+src_unpack() {
+	local ll linguas fl launcher
+	# Unpack all into the same place; overwrite common files.
+	fl=""
+	for pkg in ${A} ; do
+		cd "${WORKDIR}"
+		unpack ${pkg}
+		cd "${S}"
+		tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+		tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+		ll=$(acroread_get_ll ${pkg})
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher} ${launcher}.${ll}
+		done
+		if [[ -z ${fl} ]] ; then
+			fl=${ll}
+			linguas="${ll}"
+		else
+			linguas="${linguas} ${ll}"
+		fi
+	done
+	if [[ ${linguas} == ${fl} ]] ; then
+		# Only one lingua selected - skip building the wrappers
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher}.${fl} ${launcher} ||
+				die "Failed to put ${launcher}.${fl} back to ${launcher}; please report."
+		done
+	else
+		# Build wrappers.  Launch the acroread for the environment variable
+		# LANG (matched with a trailing * so that for example 'de_DE' matches
+		# 'de', 'en_GB' matches 'en' etc).
+		#
+		# HelpViewer is new - We don't know if Adobe are likely to
+		# internationalize it or not.
+		for launcher in ${LAUNCHERS} ; do
+			cat > ${launcher} <<-EOF
+				#!/bin/bash
+				# Copyright 1999-2009 Gentoo Foundation
+				# Distributed under the terms of the GNU General Public License v2
+				#
+				# Automatically generated by ${CATEGORY}/${PF}
+
+				# Exec the acroread script for the language chosen in
+				# LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
+				L=\${LC_ALL}
+				L=\${L:-\${LC_MESSAGES}}
+				L=\${L:-\${LANG}}
+				case \${L} in
+			EOF
+			for ll in ${linguas} ; do
+				echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
+			done
+			# default to English (in particular for LANG=C)
+			cat >> ${launcher} <<-EOF
+				*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
+				esac
+			EOF
+			chmod 755 ${launcher}
+		done
+	fi
+
+	# remove cruft
+	rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+	rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+	# replace some configuration sections
+	for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+		sed -i -e '/Font-config/,+9d' \
+			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+			"${binfile}" || die "sed configuration settings failed."
+	done
+
+	# fix erroneous Exec entry in .desktop
+	sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
+		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
+		||die "sed .desktop fix failed"
+
+	# fix braindead error in nppdf.so (bug 412051)
+	base64 -d > "${WORKDIR}/nppdf.so.patch" << ENDOFFILE
+QlNESUZGNDBIAAAAAAAAAC8AAAAAAAAAYL0CAAAAAABCWmg5MUFZJlNZFBL6EAAAFvBh+DwgDAgQ
+QAAAEABAIAAgACICaGjJtQoaaYAFPzpGDIjiUXSFYEuGy1ix8XckU4UJAUEvoQBCWmg5MUFZJlNZ
+jrYrlQABYGAAwAAIAAAIIAAwzAUppgKbECni7kinChIR1sVyoEJaaDkxQVkmU1kzGPRGAAAAEYAA
+AIYFAwAgACIHqbUIYAdBF8XckU4UJAzGPRGA
+ENDOFFILE
+	einfo "Patching nppdf.so"
+	mv Adobe/Reader9/Browser/intellinux/nppdf.so Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
+	bspatch Adobe/Reader9/Browser/intellinux/nppdf.so.orig Adobe/Reader9/Browser/intellinux/nppdf.so "${WORKDIR}/nppdf.so.patch" || die
+	rm Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader9/Resource/Icons/${res}/*
+	done
+
+	dodir /opt
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/ || die
+
+	# remove some bundled libs
+	for mylib in ${REMOVELIBS} ; do
+		einfo Removing bundled ${mylib}
+		rm -v "${D}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
+	done
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
+	done
+
+	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+	# they don't install a configuration file for libgtkembedmoz.so
+	# detection in /etc/gre.d/ like xulrunner did.
+	if ! use minimal ; then
+		if use x86 ; then
+			for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+					elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+					break # don't search any more libraries
+				fi
+			done
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	local ll lc
+	lc=0
+	for ll in ${LINGUA_LIST} ; do
+		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+	done
+	if [[ ${lc} > 1 ]] ; then
+		echo
+		elog "Multiple languages have been installed, selected via a wrapper script."
+		elog "The language is selected according to the LANG environment variable"
+		elog "(defaulting to English if LANG is not set, or no matching language"
+		elog "version is installed). Users may need to remove their preferences in"
+		elog "~/.adobe to switch languages."
+		echo
+	fi
+
+	if use minimal ; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"-minimal\"."
+		echo
+	fi
+
+	if use nsplugin ; then
+		echo
+		elog "If you're running a 64bit browser you may also want to install"
+		elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
+		elog "browser plugin."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
index ae5af607b4ac..4cc3da106b82 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild,v 1.6 2012/05/16 09:07:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild,v 1.7 2012/06/03 23:24:09 zmedico Exp $
 
-inherit java-pkg-opt-2
+inherit java-pkg-opt-2 multilib
 
 IUSE="debug java mecab ruby"
 
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index 9c9d7def451e..42a8239355af 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.13.ebuild,v 1.13 2012/05/20 09:36:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.13.ebuild,v 1.14 2012/06/03 23:24:09 zmedico Exp $
 
-inherit java-pkg-opt-2
+inherit java-pkg-opt-2 multilib
 
 IUSE="debug java mecab ruby"
 
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild
index 002e8d366c97..3d4cba7b11d3 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild,v 1.3 2012/06/02 10:45:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild,v 1.4 2012/06/03 18:32:27 maekke Exp $
 
 EAPI=2
 
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/pep/pep-2.8.ebuild b/app-text/pep/pep-2.8.ebuild
index 5bd4bc7c9577..a0ec1fc25052 100644
--- a/app-text/pep/pep-2.8.ebuild
+++ b/app-text/pep/pep-2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pep/pep-2.8.ebuild,v 1.13 2011/02/06 22:09:54 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pep/pep-2.8.ebuild,v 1.14 2012/06/03 23:56:15 zmedico Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="General purpose filter and file cleaning program"
 HOMEPAGE="http://folk.uio.no/gisle/enjoy/pep.html"
diff --git a/app-text/t1utils/t1utils-1.37.ebuild b/app-text/t1utils/t1utils-1.37.ebuild
index fa724bbd682c..0aa608f2540d 100644
--- a/app-text/t1utils/t1utils-1.37.ebuild
+++ b/app-text/t1utils/t1utils-1.37.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.37.ebuild,v 1.3 2012/06/02 10:47:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.37.ebuild,v 1.4 2012/06/03 18:34:56 maekke Exp $
 
 IUSE=""
 
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/app-text/wv/wv-1.2.9-r1.ebuild b/app-text/wv/wv-1.2.9-r1.ebuild
index 4d423e03f56d..6da8cc6df39a 100644
--- a/app-text/wv/wv-1.2.9-r1.ebuild
+++ b/app-text/wv/wv-1.2.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.9-r1.ebuild,v 1.12 2012/05/29 21:55:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.9-r1.ebuild,v 1.13 2012/06/04 04:08:31 zmedico Exp $
 
 EAPI="3"
 
-inherit eutils autotools
+inherit eutils autotools multilib
 
 DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
diff --git a/app-text/wv/wv-1.2.9.ebuild b/app-text/wv/wv-1.2.9.ebuild
index 505532be6d3d..b369768db193 100644
--- a/app-text/wv/wv-1.2.9.ebuild
+++ b/app-text/wv/wv-1.2.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.9.ebuild,v 1.3 2012/05/04 03:33:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.2.9.ebuild,v 1.4 2012/06/04 04:08:31 zmedico Exp $
 
 EAPI="3"
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
diff --git a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild b/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
index 31e61838a7f2..6f47611d0551 100644
--- a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
+++ b/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.1 2011/12/24 13:54:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.2 2012/06/04 09:51:55 ago Exp $
 
 inherit xemacs-elisp eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
diff --git a/dev-cpp/ETL/ETL-0.04.15.ebuild b/dev-cpp/ETL/ETL-0.04.15.ebuild
index 19b450840794..c9d64733bb31 100644
--- a/dev-cpp/ETL/ETL-0.04.15.ebuild
+++ b/dev-cpp/ETL/ETL-0.04.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ETL/ETL-0.04.15.ebuild,v 1.1 2012/05/17 03:20:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ETL/ETL-0.04.15.ebuild,v 1.2 2012/06/03 23:03:50 lu_zero Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/synfig/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-cpp/tbb/tbb-4.0.297.ebuild b/dev-cpp/tbb/tbb-4.0.297.ebuild
index 08a023bf803d..cdd15a28060a 100644
--- a/dev-cpp/tbb/tbb-4.0.297.ebuild
+++ b/dev-cpp/tbb/tbb-4.0.297.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.4 2012/06/01 17:58:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.5 2012/06/04 04:41:22 zmedico Exp $
 
 EAPI=4
-inherit eutils flag-o-matic versionator toolchain-funcs
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
 
 # those 2 below change pretty much every release
 # url number
diff --git a/dev-db/cdb/cdb-0.75-r2.ebuild b/dev-db/cdb/cdb-0.75-r2.ebuild
index fd136fe84457..8ba193457426 100644
--- a/dev-db/cdb/cdb-0.75-r2.ebuild
+++ b/dev-db/cdb/cdb-0.75-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75-r2.ebuild,v 1.13 2008/08/01 15:05:00 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75-r2.ebuild,v 1.14 2012/06/04 06:22:02 zmedico Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
diff --git a/dev-db/cdb/cdb-0.75-r3.ebuild b/dev-db/cdb/cdb-0.75-r3.ebuild
index a6a37df316dc..03320931862e 100644
--- a/dev-db/cdb/cdb-0.75-r3.ebuild
+++ b/dev-db/cdb/cdb-0.75-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75-r3.ebuild,v 1.3 2012/05/29 17:05:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75-r3.ebuild,v 1.4 2012/06/04 06:22:02 zmedico Exp $
 
 EAPI=3
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 
diff --git a/dev-db/couchdb/couchdb-1.1.1.ebuild b/dev-db/couchdb/couchdb-1.1.1.ebuild
index 4f42c9aa631d..cbedec3a2632 100644
--- a/dev-db/couchdb/couchdb-1.1.1.ebuild
+++ b/dev-db/couchdb/couchdb-1.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.1.1.ebuild,v 1.4 2012/02/24 14:24:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.1.1.ebuild,v 1.5 2012/06/04 06:25:25 zmedico Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils multilib user
 
 DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
 HOMEPAGE="http://couchdb.apache.org/"
diff --git a/dev-db/couchdb/couchdb-1.2.0.ebuild b/dev-db/couchdb/couchdb-1.2.0.ebuild
index ab12c53f2756..de14365e3d6e 100644
--- a/dev-db/couchdb/couchdb-1.2.0.ebuild
+++ b/dev-db/couchdb/couchdb-1.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.2.0.ebuild,v 1.1 2012/04/09 08:10:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.2.0.ebuild,v 1.2 2012/06/04 06:25:25 zmedico Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils multilib user
 
 DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
 HOMEPAGE="http://couchdb.apache.org/"
diff --git a/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild b/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild
index 30c3de5bb077..074b6986c138 100644
--- a/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild
+++ b/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild,v 1.1 2012/04/10 00:55:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.0.2011.03.13.ebuild,v 1.2 2012/06/04 06:27:25 zmedico Exp $
 
 EAPI=2
 
-inherit flag-o-matic libtool autotools eutils pam versionator
+inherit flag-o-matic libtool autotools eutils pam user versionator
 
 # Upstream version numbers live in a directory that is [+-][1-2] days either
 # side of the name the tarball! eg:
diff --git a/dev-db/drizzle/drizzle-7.1.33.ebuild b/dev-db/drizzle/drizzle-7.1.33.ebuild
index 18373538286a..eb1ed66a4bc6 100644
--- a/dev-db/drizzle/drizzle-7.1.33.ebuild
+++ b/dev-db/drizzle/drizzle-7.1.33.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.1.33.ebuild,v 1.1 2012/04/10 00:30:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.1.33.ebuild,v 1.2 2012/06/04 06:27:25 zmedico Exp $
 
 EAPI=2
 
-inherit flag-o-matic libtool autotools eutils pam versionator
+inherit flag-o-matic libtool autotools eutils pam user versionator
 
 MY_P="${P}-stable"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
index 9d796d8ca9b0..0e424736d065 100644
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.5 2010/06/16 19:25:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.6 2012/06/04 06:30:31 zmedico Exp $
 
-inherit flag-o-matic eutils autotools versionator multilib
+inherit flag-o-matic eutils autotools user versionator multilib
 
 MY_P=Firebird-$(replace_version_separator 4 -)
 
diff --git a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild b/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
index ebbe7dc2b873..188c3ea69bc4 100644
--- a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0.ebuild,v 1.3 2010/06/16 19:25:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0.ebuild,v 1.4 2012/06/04 06:30:31 zmedico Exp $
 
-inherit flag-o-matic eutils autotools versionator
+inherit flag-o-matic eutils autotools user versionator
 
 MY_P=Firebird-$(replace_version_separator 4 -)
 #MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
diff --git a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild b/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
index 2758c942fce9..4993116ce8bc 100644
--- a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.1.26351.0.ebuild,v 1.1 2011/12/30 06:25:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.1.26351.0.ebuild,v 1.2 2012/06/04 06:30:31 zmedico Exp $
 
 EAPI=4
 
-inherit flag-o-matic eutils autotools multilib versionator
+inherit flag-o-matic eutils autotools multilib user versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
 #MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
index e842964186ba..62301fb39ef1 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.7 2012/02/07 12:26:05 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.8 2012/06/04 06:32:37 zmedico Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
-inherit eutils versionator java-pkg-2 java-ant-2
+inherit eutils user versionator java-pkg-2 java-ant-2
 
 MY_PV=$(replace_all_version_separators _ )
 MY_P="${PN}_${MY_PV}"
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
index a924c1e38137..54ae24077519 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.3 2012/04/15 18:42:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.4 2012/06/04 06:32:37 zmedico Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
-inherit eutils versionator java-pkg-2 java-ant-2
+inherit eutils user versionator java-pkg-2 java-ant-2
 
 MY_PV=$(replace_all_version_separators _ )
 MY_P="${PN}_${MY_PV}"
diff --git a/dev-db/mongodb/mongodb-1.8.4-r1.ebuild b/dev-db/mongodb/mongodb-1.8.4-r1.ebuild
index 42976657c254..99f191846486 100644
--- a/dev-db/mongodb/mongodb-1.8.4-r1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4-r1.ebuild,v 1.3 2012/03/19 14:51:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4-r1.ebuild,v 1.4 2012/06/04 06:34:29 zmedico Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
 
-inherit eutils multilib pax-utils scons-utils versionator
+inherit eutils multilib pax-utils scons-utils user versionator
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
diff --git a/dev-db/mongodb/mongodb-2.0.4.ebuild b/dev-db/mongodb/mongodb-2.0.4.ebuild
index 5368bf0ce6cd..28dcb7c11ec1 100644
--- a/dev-db/mongodb/mongodb-2.0.4.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.4.ebuild,v 1.2 2012/04/03 08:48:00 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.4.ebuild,v 1.3 2012/06/04 06:34:29 zmedico Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
 
-inherit eutils multilib pax-utils scons-utils versionator
+inherit eutils multilib pax-utils scons-utils user versionator
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
diff --git a/dev-db/mongodb/mongodb-2.0.5.ebuild b/dev-db/mongodb/mongodb-2.0.5.ebuild
index aa53b26d5ce6..f2c8c6f06ae7 100644
--- a/dev-db/mongodb/mongodb-2.0.5.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.5.ebuild,v 1.2 2012/05/14 12:18:49 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.5.ebuild,v 1.3 2012/06/04 06:34:29 zmedico Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
 
-inherit eutils multilib pax-utils scons-utils versionator
+inherit eutils multilib pax-utils scons-utils user versionator
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
index 212ba9f5d6c0..50276c6fd4b7 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild,v 1.5 2009/08/23 01:47:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild,v 1.6 2012/06/04 06:37:16 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
 MY_PSDK_x86="${MY_P_x86/basic/sdk}"
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
index 9b62a6453a80..be89502e2efa 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild,v 1.1 2010/11/12 18:16:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild,v 1.2 2012/06/04 06:37:16 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
 MY_PSDK_x86="${MY_P_x86/basic/sdk}"
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
index 77ef96e51005..c79489d9cbb7 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild,v 1.7 2008/06/18 22:35:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.2.0.3.ebuild,v 1.8 2012/06/04 06:39:47 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
 MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
index 1042506b81e4..72a45a7510a2 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild,v 1.2 2010/11/13 16:03:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.2.ebuild,v 1.3 2012/06/04 06:39:47 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
 MY_P_amd64="${PN/oracle-instantclient-/instantclient-}-linux-x86-64-${PV}.0"
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
index 3cbe3cfd4a7d..e0ce96064bb7 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild,v 1.3 2012/03/07 16:25:45 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild,v 1.4 2012/06/04 06:39:47 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils multilib
 
 MY_PLAT_x86="Linux x86"
 MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
index 07d19d35a2b8..59fe6fda5a70 100644
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild,v 1.1 2011/08/28 20:54:30 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2-r1.ebuild,v 1.2 2012/06/04 06:41:21 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
 MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}.0"
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
index 32fcf15726ba..9fc01b78ab5e 100644
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.3 2012/03/07 16:25:00 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.4 2012/06/04 06:41:21 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils multilib
 
 MY_PLAT_x86="Linux x86"
 MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
index 17086d626f25..51f19e4b8580 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild,v 1.7 2008/06/18 22:35:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.2.0.3.ebuild,v 1.8 2012/06/04 06:43:20 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
 MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
index ee15d0b54698..f6397f02d4cf 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild,v 1.1 2010/11/12 18:19:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.2.ebuild,v 1.2 2012/06/04 06:43:20 zmedico Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
 MY_P_amd64="${PN/oracle-instantclient-/instantclient-}-linux-x86-64-${PV}.0"
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
index d2a6e470b3c9..b48fc06c3f79 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild,v 1.1 2012/03/07 14:13:14 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild,v 1.2 2012/06/04 06:43:20 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils multilib
 
 MY_PLAT_x86="Linux x86"
 MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
diff --git a/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild b/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild
index c898e5ff0bf6..d1befc890788 100644
--- a/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild,v 1.1 2011/11/16 04:17:36 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils user
 
 RESTRICT="test"
 
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild
index de7218cbfbc0..bd20dff2b40b 100644
--- a/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild,v 1.1 2012/04/18 20:02:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils user
 
 RESTRICT="test"
 
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.ebuild
index a87da03dbc6a..35c37754f6f8 100644
--- a/dev-db/pgbouncer/pgbouncer-1.5.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.ebuild,v 1.1 2012/03/29 02:16:02 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils user
 
 RESTRICT="test"
 
diff --git a/dev-db/postgis/postgis-1.3.6-r1.ebuild b/dev-db/postgis/postgis-1.3.6-r1.ebuild
index f594bd6527dc..235766499f68 100644
--- a/dev-db/postgis/postgis-1.3.6-r1.ebuild
+++ b/dev-db/postgis/postgis-1.3.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r1.ebuild,v 1.2 2010/06/17 19:09:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.6-r1.ebuild,v 1.3 2012/06/04 06:47:41 zmedico Exp $
 
 EAPI="1"
 
-inherit eutils versionator
+inherit eutils multilib versionator
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.refractions.net"
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild
index 028b4f47109e..1a86f5ab10aa 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild,v 1.10 2012/05/03 02:33:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild,v 1.11 2012/06/04 06:49:58 zmedico Exp $
 
 EAPI="4"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix versionator
+inherit autotools eutils multilib pam prefix user versionator
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild
index 11cb7c33b0b9..1da432e986f1 100644
--- a/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild,v 1.10 2012/05/03 02:33:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild,v 1.11 2012/06/04 06:49:58 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
+inherit autotools eutils multilib pam prefix python user versionator
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild
index cea3ec29d37e..25fa30f038ca 100644
--- a/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild,v 1.10 2012/05/03 02:33:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild,v 1.11 2012/06/04 06:49:58 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
+inherit autotools eutils multilib pam prefix python user versionator
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild
index b5462acf25b0..74f5b63067ce 100644
--- a/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild,v 1.11 2012/05/12 18:31:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild,v 1.12 2012/06/04 06:49:58 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python versionator
+inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
index d07d307619ea..d84c3848f252 100644
--- a/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild,v 1.1 2012/05/27 15:07:14 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild,v 1.2 2012/06/04 06:49:58 zmedico Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python versionator
+inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
diff --git a/dev-db/redis/redis-2.4.10.ebuild b/dev-db/redis/redis-2.4.10.ebuild
index 77804df35d8d..d82d197e1b42 100644
--- a/dev-db/redis/redis-2.4.10.ebuild
+++ b/dev-db/redis/redis-2.4.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.10.ebuild,v 1.3 2012/05/21 09:28:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.10.ebuild,v 1.4 2012/06/04 06:52:15 zmedico Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic user
 
 DESCRIPTION="A persistent caching system, key-value and data structures database."
 HOMEPAGE="http://redis.io/"
diff --git a/dev-db/redis/redis-2.4.13.ebuild b/dev-db/redis/redis-2.4.13.ebuild
index 6037b947e094..fc85df88e6cf 100644
--- a/dev-db/redis/redis-2.4.13.ebuild
+++ b/dev-db/redis/redis-2.4.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.13.ebuild,v 1.1 2012/05/02 12:09:02 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.13.ebuild,v 1.2 2012/06/04 06:52:15 zmedico Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic user
 
 DESCRIPTION="A persistent caching system, key-value and data structures database."
 HOMEPAGE="http://redis.io/"
diff --git a/dev-db/redis/redis-2.4.14.ebuild b/dev-db/redis/redis-2.4.14.ebuild
index a2b0bd1605b1..1bd2f972d106 100644
--- a/dev-db/redis/redis-2.4.14.ebuild
+++ b/dev-db/redis/redis-2.4.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.14.ebuild,v 1.1 2012/05/31 07:54:28 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.14.ebuild,v 1.2 2012/06/04 06:52:15 zmedico Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic user
 
 DESCRIPTION="A persistent caching system, key-value and data structures database."
 HOMEPAGE="http://redis.io/"
diff --git a/dev-db/redis/redis-2.4.4-r1.ebuild b/dev-db/redis/redis-2.4.4-r1.ebuild
index 8ba963ff3496..bb5cf05fb024 100644
--- a/dev-db/redis/redis-2.4.4-r1.ebuild
+++ b/dev-db/redis/redis-2.4.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.4-r1.ebuild,v 1.3 2012/04/09 12:12:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.4-r1.ebuild,v 1.4 2012/06/04 06:52:15 zmedico Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic
+inherit autotools eutils flag-o-matic user
 
 DESCRIPTION="A persistent caching system, key-value and data structures database."
 HOMEPAGE="http://redis.io/"
diff --git a/dev-db/sqldeveloper/metadata.xml b/dev-db/sqldeveloper/metadata.xml
index 2887c01c518f..77d2c7c72cd0 100644
--- a/dev-db/sqldeveloper/metadata.xml
+++ b/dev-db/sqldeveloper/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>jan.bednar@gmail.com</email>
 	<name>Ján Bednár</name>
 	<description>Maintainer</description>
 </maintainer>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-	<description>Proxy maintainer</description>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
index a7c57af826d2..c9a48c944847 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r5.ebuild,v 1.6 2012/05/30 22:56:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r5.ebuild,v 1.7 2012/06/04 06:55:12 zmedico Exp $
 
-inherit eutils alternatives toolchain-funcs
+inherit eutils alternatives multilib toolchain-funcs
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild
index 6d37ee37863a..1c0f81508b1a 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild,v 1.4 2010/10/22 18:58:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.87.ebuild,v 1.5 2012/06/04 07:04:26 zmedico Exp $
 
 EAPI="3"
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="ODBC driver to access local SQLite database files."
 HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild
index bee023a97be1..5dc420fd2dec 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild,v 1.1 2012/05/05 11:12:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.94.ebuild,v 1.2 2012/06/04 07:04:26 zmedico Exp $
 
 EAPI=4
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="ODBC driver to access local SQLite database files."
 HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
diff --git a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
index a693d2e19dda..ad3e5bac878c 100644
--- a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.77-r2.ebuild,v 1.1 2012/03/08 17:23:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.77-r2.ebuild,v 1.2 2012/06/03 19:34:42 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.corpit.ru/mjt/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild b/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild
index be4ee7e336f9..d00a427f03e9 100644
--- a/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild
+++ b/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild,v 1.3 2011/06/28 12:27:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.10-r3.ebuild,v 1.4 2012/06/04 07:08:28 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils mono versionator
+inherit eutils mono multilib versionator
 
 PV_MAJOR=$(get_version_component_range 1-2)
 
diff --git a/dev-dotnet/log4net/log4net-1.2.11.ebuild b/dev-dotnet/log4net/log4net-1.2.11.ebuild
index 7938f5c50a73..580c46016e69 100644
--- a/dev-dotnet/log4net/log4net-1.2.11.ebuild
+++ b/dev-dotnet/log4net/log4net-1.2.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.11.ebuild,v 1.3 2012/05/22 12:16:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.11.ebuild,v 1.4 2012/06/04 07:08:28 zmedico Exp $
 
 EAPI="4"
 
-inherit eutils mono versionator
+inherit eutils mono multilib versionator
 
 PV_MAJOR=$(get_version_component_range 1-2)
 
diff --git a/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild b/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild
index bae1a05b0ac6..f6b2c2f2ee6c 100644
--- a/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild
+++ b/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild,v 1.3 2011/01/25 21:24:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/monocalendar/monocalendar-0.7.2.ebuild,v 1.4 2012/06/04 07:10:44 zmedico Exp $
 
-inherit mono eutils
+inherit mono eutils multilib
 
 S="${WORKDIR}/MonoCalendar"
 
diff --git a/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild
index d72ed8938f17..a672c07e4d1b 100644
--- a/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild
+++ b/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild,v 1.3 2012/05/22 12:17:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild,v 1.4 2012/06/04 07:12:22 zmedico Exp $
 
 EAPI="4"
-inherit go-mono mono
+inherit go-mono mono user
 
 PATCHDIR="${FILESDIR}/2.2/"
 
diff --git a/dev-dotnet/xsp/xsp-2.10.2.ebuild b/dev-dotnet/xsp/xsp-2.10.2.ebuild
index e2022c63f62d..31490eab3893 100644
--- a/dev-dotnet/xsp/xsp-2.10.2.ebuild
+++ b/dev-dotnet/xsp/xsp-2.10.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2.ebuild,v 1.4 2011/11/10 19:26:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2.ebuild,v 1.5 2012/06/04 07:12:22 zmedico Exp $
 
 EAPI=2
 
-inherit go-mono mono
+inherit go-mono mono user
 
 PATCHDIR="${FILESDIR}/2.2/"
 
diff --git a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
index f0888f74f815..54e10e0bb57b 100644
--- a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
+++ b/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild,v 1.1 2010/06/29 17:35:55 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild,v 1.2 2012/06/04 07:13:48 zmedico Exp $
 
-inherit eutils
+inherit eutils user
 
 SBOX_GROUP="sbox"
 
diff --git a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
index 9f2d1b28ac9c..2d4bd5664521 100644
--- a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
+++ b/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild,v 1.1 2010/09/19 10:16:33 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild,v 1.2 2012/06/04 07:13:48 zmedico Exp $
 
-inherit eutils
+inherit eutils user
 
 SBOX_GROUP="sbox"
 
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index 11895390056b..02283ff283a5 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.6 2012/05/03 06:35:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild,v 1.7 2012/06/04 07:17:38 zmedico Exp $
 
 EAPI=3
 
-inherit eutils cmake-utils wxwidgets
+inherit eutils cmake-utils flag-o-matic wxwidgets
 
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
index 1fad9ce286e7..b364f879b030 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild,v 1.2 2012/03/25 17:00:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild,v 1.3 2012/06/04 06:47:03 johu Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="kernel_linux"
 
 COMMON_DEP="
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild
index 007102b2d2a2..7ac2cbb78515 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild,v 1.2 2012/02/14 11:54:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.2.1-r1.ebuild,v 1.4 2012/06/04 08:04:18 johu Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild
index 7260ccdf4344..7a37b8f25d12 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild,v 1.1 2012/03/08 09:31:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.1-r1.ebuild,v 1.2 2012/06/04 07:20:35 zmedico Exp $
 
 EAPI="4"
 
-inherit java-vm-2 prefix
+inherit java-vm-2 multilib prefix
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild
index f68026c30218..8f9e9d652fd2 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild,v 1.3 2012/02/19 10:46:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.1.ebuild,v 1.4 2012/06/04 07:20:35 zmedico Exp $
 
 EAPI="4"
 
-inherit java-vm-2 prefix
+inherit java-vm-2 multilib prefix
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild
index ad42dd7c40bb..f505f80519de 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild,v 1.1 2012/03/08 09:31:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1-r1.ebuild,v 1.2 2012/06/04 07:20:35 zmedico Exp $
 
 EAPI="4"
 
-inherit java-vm-2 prefix
+inherit java-vm-2 multilib prefix
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
index efac259c5637..6f629461c553 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild,v 1.1 2012/03/03 21:25:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild,v 1.2 2012/06/04 07:20:35 zmedico Exp $
 
 EAPI="4"
 
-inherit java-vm-2 prefix
+inherit java-vm-2 multilib prefix
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 TARBALL_VERSION="${PV}"
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
index 0539f6ce1ee1..0ae40e6d57d3 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild,v 1.1 2012/05/03 18:05:52 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild,v 1.2 2012/06/03 19:33:19 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/jakarta/oro/source/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/lucene/lucene-3.0.3.ebuild b/dev-java/lucene/lucene-3.0.3.ebuild
index 73125c0e468c..d71ef56117f0 100644
--- a/dev-java/lucene/lucene-3.0.3.ebuild
+++ b/dev-java/lucene/lucene-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.0.3.ebuild,v 1.5 2012/05/12 03:32:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.0.3.ebuild,v 1.6 2012/06/04 05:22:42 xmw Exp $
 
 EAPI="3"
 JAVA_PKG_IUSE="doc source test"
@@ -16,7 +16,7 @@ HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps:0
diff --git a/dev-java/lzmajio/lzmajio-0.95.ebuild b/dev-java/lzmajio/lzmajio-0.95.ebuild
index 610cf35a6f94..9f4860f945d1 100644
--- a/dev-java/lzmajio/lzmajio-0.95.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/lzmajio-0.95.ebuild,v 1.2 2012/04/13 18:51:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lzmajio/lzmajio-0.95.ebuild,v 1.4 2012/06/04 08:22:51 johu Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
index e13101458b73..62f869ac6bc4 100644
--- a/dev-java/saaj/saaj-1.3.19-r1.ebuild
+++ b/dev-java/saaj/saaj-1.3.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/saaj-1.3.19-r1.ebuild,v 1.1 2012/06/03 08:07:39 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/saaj-1.3.19-r1.ebuild,v 1.2 2012/06/03 19:32:25 ago Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # jaf and saaj-api only for java 5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild
index f5a071e7bdf6..9a91c9234b1e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild,v 1.3 2012/05/02 17:17:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild,v 1.4 2012/06/04 07:32:05 johu Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-libs/boost/boost-1.48.0-r2.ebuild b/dev-libs/boost/boost-1.48.0-r2.ebuild
index 964c07239ffc..18ef069a1460 100644
--- a/dev-libs/boost/boost-1.48.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.48.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0-r2.ebuild,v 1.4 2012/05/23 20:37:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0-r2.ebuild,v 1.5 2012/06/03 18:11:52 maekke Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc +eselect icu mpi python static-libs test tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
index a63a3c87f098..5a8cd0890fbd 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.19 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.20 2012/06/04 07:30:23 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
 
 inherit gnome2 multilib python libtool eutils autotools
 
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild
index a79f41dc8a3c..3725aa27f0ed 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild,v 1.10 2012/05/21 18:44:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r1.ebuild,v 1.11 2012/06/04 07:30:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
 
 inherit eutils gnome2 multilib python
 
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
index b5c58528a777..ca1eaa176682 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v 1.12 2012/05/21 18:44:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v 1.13 2012/06/04 07:30:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
 
 inherit eutils gnome2 multilib python
 
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild
index 340028dc5113..fbe1eb8b0fda 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild,v 1.3 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.0.ebuild,v 1.4 2012/06/04 07:30:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="xml"
 
 inherit gnome2 python
 
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
index 1a20a8722b57..b4c482c6e5b8 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.4 2012/05/06 12:24:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.5 2012/06/04 07:30:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="xml"
 
 inherit gnome2 python
 
diff --git a/dev-libs/icu/icu-49.1.1-r1.ebuild b/dev-libs/icu/icu-49.1.1-r1.ebuild
index 083f068ce7c4..03a2fc06d048 100644
--- a/dev-libs/icu/icu-49.1.1-r1.ebuild
+++ b/dev-libs/icu/icu-49.1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.9 2012/05/29 12:07:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.10 2012/06/03 17:18:36 armin76 Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator flag-o-matic
 
 MAJOR_VERSION="$(get_version_component_range 1)"
 if [[ "${PV}" =~ ^[[:digit:]]+_rc[[:digit:]]*$ ]]; then
@@ -25,7 +25,7 @@ SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="doc? ( app-arch/unzip )"
@@ -60,6 +60,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Fails without this on s390/sparc
+	if use s390 || use sparc; then
+		append-flags "-DU_IS_BIG_ENDIAN=1"
+	fi
+
 	econf \
 		$(use_enable debug) \
 		$(use_enable examples samples) \
diff --git a/dev-libs/json-c/json-c-0.9-r1.ebuild b/dev-libs/json-c/json-c-0.9-r1.ebuild
index 80b2f7e22e4c..53029538ba48 100644
--- a/dev-libs/json-c/json-c-0.9-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.2 2012/06/02 11:37:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.3 2012/06/03 18:37:24 maekke Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="http://oss.metaparadigm.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 DOCS=( README )
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch b/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch
new file mode 100644
index 000000000000..92c9a98c655c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.8.0-icu-linking.patch
@@ -0,0 +1,125 @@
+From 6ee653ecbef38c0e57860903541f1f3c97dbe75b Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
+Date: Sat, 26 May 2012 17:37:43 +0000
+Subject: [PATCH] Handle ICU_LIBS as LIBADD, not LDFLAGS to prevent linking
+ errors
+
+---
+ Makefile.am                  |    2 +-
+ configure.in                 |   15 ++++++++-------
+ libxml-2.0-uninstalled.pc.in |    2 +-
+ libxml-2.0.pc.in             |    2 +-
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f82cefa..0b25666 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@ bin_PROGRAMS = xmllint xmlcatalog
+ bin_SCRIPTS=xml2-config
+ 
+ lib_LTLIBRARIES = libxml2.la
+-libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
++libxml2_la_LIBADD = @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
+ 
+ if USE_VERSION_SCRIPT
+ LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
+diff --git a/configure.in b/configure.in
+index 0fb4983..ac45b58 100644
+--- a/configure.in
++++ b/configure.in
+@@ -97,7 +97,7 @@ dnl
+ dnl zlib option might change flags, so we save them initially
+ dnl
+ _cppflags="${CPPFLAGS}"
+-_ldflags="${LDFLAGS}"
++_libs="${LIBS}"
+ 
+ AC_ARG_WITH(c14n,
+ [  --with-c14n             add the Canonicalization support (on)])
+@@ -154,7 +154,7 @@ AC_ARG_WITH(readline,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     RDL_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(regexps,
+@@ -190,7 +190,7 @@ AC_ARG_WITH(zlib,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     Z_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(lzma,
+@@ -198,7 +198,7 @@ AC_ARG_WITH(lzma,
+   if test "$withval" != "no" -a "$withval" != "yes"; then
+     LZMA_DIR=$withval
+     CPPFLAGS="${CPPFLAGS} -I$withval/include"
+-    LDFLAGS="${LDFLAGS} -L$withval/lib"
++    LIBS="${LIBS} -L$withval/lib"
+   fi
+ ])
+ AC_ARG_WITH(coverage,
+@@ -428,7 +428,7 @@ AC_SUBST(LZMA_LIBS)
+ AC_SUBST(WITH_LZMA)
+ 
+ CPPFLAGS=${_cppflags}
+-LDFLAGS=${_ldflags}
++LIBS=${_libs}
+ 
+ echo Checking headers
+ 
+@@ -1365,14 +1365,14 @@ XML_LIBTOOLLIBS="libxml2.la"
+ AC_SUBST(WITH_ICONV)
+ 
+ WITH_ICU=0
++ICU_LIBS=""
+ if test "$with_icu" != "yes" ; then
+     echo Disabling ICU support
+ else
+     ICU_CONFIG=icu-config
+     if ${ICU_CONFIG} --cflags >/dev/null 2>&1
+     then
+-        ICU_LIBS=`icu-config --ldflags`
+-        LDFLAGS="$LDFLAGS $ICU_LIBS"
++        ICU_LIBS=`${ICU_CONFIG} --ldflags`
+         WITH_ICU=1
+         echo Enabling ICU support
+     else
+@@ -1380,6 +1380,7 @@ else
+     fi
+ fi
+ AC_SUBST(WITH_ICU)
++AC_SUBST(ICU_LIBS)
+ 
+ WITH_ISO8859X=1
+ if test "$WITH_ICONV" != "1" ; then
+diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in
+index 0a4c833..cab6834 100644
+--- a/libxml-2.0-uninstalled.pc.in
++++ b/libxml-2.0-uninstalled.pc.in
+@@ -8,5 +8,5 @@ Name: libXML
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
+diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
+index 31a1b8c..f5f5f03 100644
+--- a/libxml-2.0.pc.in
++++ b/libxml-2.0.pc.in
+@@ -9,5 +9,5 @@ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+ Libs: -L${libdir} -lxml2
+-Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
+ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
+-- 
+1.7.8.6
+
diff --git a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
index 763d2643ea87..0771bb42efa5 100644
--- a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.3 2012/05/27 15:17:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.4 2012/06/04 04:36:32 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -36,7 +36,6 @@ RDEPEND="sys-libs/zlib
 	readline? ( sys-libs/readline )"
 
 DEPEND="${RDEPEND}
-	python? ( dev-util/fix-la-relink-command )
 	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
@@ -70,6 +69,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-2.7.8-disable_static_modules.patch"
 
+	# Prevent liking to out-of-build-tree libxml2, bug #417539
+	epatch "${FILESDIR}/${PN}-2.8.0-icu-linking.patch"
+
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
@@ -153,8 +155,6 @@ src_install() {
 
 	if use python; then
 		installation() {
-			# bug #417539
-			fix-la-relink-command . || die "fix-la-relink-command failed"
 			emake DESTDIR="${D}" \
 				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
 				docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
diff --git a/dev-libs/uriparser/uriparser-0.7.7.ebuild b/dev-libs/uriparser/uriparser-0.7.7.ebuild
index 59ebe26a291c..9fbd2e9f8f16 100644
--- a/dev-libs/uriparser/uriparser-0.7.7.ebuild
+++ b/dev-libs/uriparser/uriparser-0.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.7.ebuild,v 1.3 2012/06/02 10:43:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.7.ebuild,v 1.4 2012/06/04 06:11:09 johu Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt4 test unicode"
 
 RDEPEND=""
diff --git a/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.3.ebuild b/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.3.ebuild
deleted file mode 100644
index 6a7cdb8d56a0..000000000000
--- a/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Audio-FLAC-Header/Audio-FLAC-Header-2.3.ebuild,v 1.3 2010/01/09 16:29:18 grobian Exp $
-
-MODULE_AUTHOR=DANIEL
-inherit perl-module
-
-DESCRIPTION="Access to FLAC audio metadata"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="media-libs/flac
-	dev-lang/perl"
-
-SRC_TEST="do"
diff --git a/dev-perl/Audio-FLAC-Header/Manifest b/dev-perl/Audio-FLAC-Header/Manifest
index 51740c9bffd9..d618db27b644 100644
--- a/dev-perl/Audio-FLAC-Header/Manifest
+++ b/dev-perl/Audio-FLAC-Header/Manifest
@@ -1,2 +1 @@
-DIST Audio-FLAC-Header-2.3.tar.gz 117643 RMD160 f195e0b0d489233bde781bcffb057f0329c29c18 SHA1 803610c1f88ac35e136eedffdfd691b623dcc145 SHA256 4cd98da24e5d8806867970de65228308dc261f03d5dfdadef7b74fcf46f4ecb8
 DIST Audio-FLAC-Header-2.4.tar.gz 121068 RMD160 671ffbc019d5b9e608108899161ec742a60ece21 SHA1 7a036801b2557a196134064fe2b294a791286355 SHA256 fba5911d6c22d81506565cd9a1438e8605420ff7986cf03d1a12d006a4070543
diff --git a/dev-perl/CGI-Session/CGI-Session-4.41.ebuild b/dev-perl/CGI-Session/CGI-Session-4.41.ebuild
deleted file mode 100644
index 2a79fcb06ba3..000000000000
--- a/dev-perl/CGI-Session/CGI-Session-4.41.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/CGI-Session/CGI-Session-4.41.ebuild,v 1.6 2012/05/28 16:11:39 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=MARKSTOS
-inherit perl-module
-
-DESCRIPTION="persistent session data in CGI applications "
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND="virtual/perl-Digest-MD5
-	virtual/perl-Scalar-List-Utils
-	>=virtual/perl-CGI-3.26"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? ( virtual/perl-Test-Simple
-		dev-perl/Cgi-Simple
-		dev-perl/Test-Pod )"
-
-SRC_TEST="do"
diff --git a/dev-perl/CGI-Session/Manifest b/dev-perl/CGI-Session/Manifest
index a4152eb31ec2..cb0fe7973bec 100644
--- a/dev-perl/CGI-Session/Manifest
+++ b/dev-perl/CGI-Session/Manifest
@@ -1,2 +1 @@
-DIST CGI-Session-4.41.tar.gz 69645 RMD160 ea2807f16a85ffc49b8fcca369302e8f638fbd6c SHA1 9f86a62b759801d985959cb70ab3f5874511e03f SHA256 f848afef69009c202ad0daa1c696618fc37c7a93277aef6119fa5bff08eeed23
 DIST CGI-Session-4.48.tar.gz 95291 RMD160 1937f19e8d247369826254da3e69459a0fda5efd SHA1 82dd630a11f2a0b01ea710c33225858718d99187 SHA256 46756461c24ce7666b8108ddb96dbab612699df3012c80ef11016619fe1554f7
diff --git a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.18.ebuild b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.18.ebuild
deleted file mode 100644
index ac0775ac61e4..000000000000
--- a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.18.ebuild,v 1.10 2012/03/19 19:27:17 armin76 Exp $
-
-inherit perl-module
-
-DESCRIPTION="Inject modules into a CPAN::Mini mirror. "
-HOMEPAGE="http://search.cpan.org/~ssoriche/${P}/"
-SRC_URI="mirror://cpan/authors/id/S/SS/SSORICHE/${P}.tar.gz"
-
-LICENSE="Artistic"
-#LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-# Disabled
-#SRC_TEST="do"
-
-DEPEND="dev-perl/libwww-perl
-		virtual/perl-IO-Compress
-		dev-perl/HTTP-Server-Simple
-		>=dev-perl/CPAN-Mini-0.32
-		dev-perl/CPAN-Checksums
-	dev-lang/perl"
-RDEPEND="${DEPEND}"
diff --git a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.300.0.ebuild b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.300.0.ebuild
deleted file mode 100644
index 2e5528128ddf..000000000000
--- a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.300.0.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-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.300.0.ebuild,v 1.2 2012/03/19 19:27:17 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=MITHALDU
-MODULE_VERSION=0.30
-inherit perl-module
-
-DESCRIPTION="Inject modules into a CPAN::Mini mirror. "
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Disabled
-#SRC_TEST="do"
-
-RDEPEND="dev-perl/libwww-perl
-	virtual/perl-IO-Compress
-	virtual/perl-Archive-Tar
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=virtual/perl-Module-Build-0.380.0
-	>=dev-perl/CPAN-Mini-0.32
-	dev-perl/CPAN-Checksums
-	dev-perl/File-Slurp
-	dev-perl/yaml"
-#	test? ( dev-perl/HTTP-Server-Simple )"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/CPAN-Mini-Inject/Manifest b/dev-perl/CPAN-Mini-Inject/Manifest
index bfdbc78124fa..22045ab4207b 100644
--- a/dev-perl/CPAN-Mini-Inject/Manifest
+++ b/dev-perl/CPAN-Mini-Inject/Manifest
@@ -1,3 +1 @@
-DIST CPAN-Mini-Inject-0.18.tar.gz 13792 RMD160 96c798141fb03f844ac2c976a471120023e903fb SHA1 cf2abb12ef03d977e24141ec0514abba9f132498 SHA256 87c0885d0b4893bfbee7b799125838d168a4044b94ec7a53b7b80215e5f5c32c
-DIST CPAN-Mini-Inject-0.30.tar.gz 24109 RMD160 e539b52546ae66fc1a85bfb6ca68696c86699800 SHA1 adfac201fef3ce91c5ef255c3b167e21a29342ea SHA256 9b7e5d7ad761b173c5bbacc3f2009839bc2ef8f60a8303afe8bc3ebf6f46d51d
 DIST CPAN-Mini-Inject-0.31.tar.gz 26438 RMD160 b68f4cb1e551fcd9d3a1d28b2e22b20d15cb3bfe SHA1 d604ff380aca0889e31e718b123da8cb3cee5e57 SHA256 e2e48f5fc063eca5b97b6bf8c83041bad95e2159049dedebb3c2bec66c398234
diff --git a/dev-perl/Cairo/Cairo-1.06.0.ebuild b/dev-perl/Cairo/Cairo-1.06.0.ebuild
deleted file mode 100644
index 6bb7bc13de86..000000000000
--- a/dev-perl/Cairo/Cairo-1.06.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.06.0.ebuild,v 1.6 2008/06/13 09:32:04 jer Exp $
-
-inherit perl-module versionator
-
-MY_P="${PN}-$(delete_version_separator 2)"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Perl interface to the cairo library"
-HOMEPAGE="http://search.cpan.org/dist/Cairo/"
-SRC_URI="mirror://cpan/authors/id/T/TS/TSCH/${MY_P}.tar.gz"
-
-IUSE="test"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-SRC_TEST="do"
-
-RDEPEND=">=x11-libs/cairo-1.0.0"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205
-	>=dev-perl/extutils-pkgconfig-1.07
-	test? ( dev-perl/Test-Number-Delta )"
diff --git a/dev-perl/Cairo/Cairo-1.62.0.ebuild b/dev-perl/Cairo/Cairo-1.62.0.ebuild
deleted file mode 100644
index 13ef4b512d99..000000000000
--- a/dev-perl/Cairo/Cairo-1.62.0.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/dev-perl/Cairo/Cairo-1.62.0.ebuild,v 1.2 2011/05/11 08:40:54 xmw Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=1.062
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/cairo-1.0.0"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205
-	>=dev-perl/extutils-pkgconfig-1.07
-	test? ( dev-perl/Test-Number-Delta )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
-}
-
-src_test() {
-	mv "${S}"/t/CairoSurface.t{,.disable} || die
-	perl-module_src_test
-}
diff --git a/dev-perl/Cairo/Cairo-1.81.0.ebuild b/dev-perl/Cairo/Cairo-1.81.0.ebuild
deleted file mode 100644
index 92056b0e0fa3..000000000000
--- a/dev-perl/Cairo/Cairo-1.81.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.81.0.ebuild,v 1.1 2011/10/20 19:29:56 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=1.081
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/cairo-1.0.0"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205.0
-	>=dev-perl/extutils-pkgconfig-1.70.0
-	test? ( dev-perl/Test-Number-Delta )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
-}
diff --git a/dev-perl/Cairo/Cairo-1.82.0.ebuild b/dev-perl/Cairo/Cairo-1.82.0.ebuild
deleted file mode 100644
index fa9ce16bd6f8..000000000000
--- a/dev-perl/Cairo/Cairo-1.82.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.82.0.ebuild,v 1.1 2012/01/08 20:25:59 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.082
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=x11-libs/cairo-1.0.0"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205.0
-	>=dev-perl/extutils-pkgconfig-1.70.0
-	test? ( dev-perl/Test-Number-Delta )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
-}
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index 7630a781e10d..21ad60ea215d 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -1,5 +1 @@
-DIST Cairo-1.060.tar.gz 90111 RMD160 f514f5065b53ca740ea415ec97f0d45f5208b637 SHA1 af0334d7732f991509c0b90e509040d4bbd2b939 SHA256 34e738467ad3517dd061202617245f03431059b3980476c43d8e06bf2ce7bfca
-DIST Cairo-1.062.tar.gz 95044 RMD160 e383fe798ec08d65df3318186dd9b1b0ad8307f6 SHA1 9e18187157911fda065795892b14f0ec9947a778 SHA256 9ddf01809d5246269713648eae6cc9cd20a370c613f1c26acd6759228800029e
-DIST Cairo-1.081.tar.gz 106643 RMD160 ccbd89212e5b59ab6ccca9c0ceb901b5c43d4d37 SHA1 4fa4db3a21ed10439ba10a215b5c7d583e517d09 SHA256 2ef23a32ecd16c0b4b383accd2452ec324c54fa3498d870e083523ef60871582
-DIST Cairo-1.082.tar.gz 104974 RMD160 836bad8acbf61a595a1b27d28b8d76d58bf2a3bc SHA1 1f83c4d1153f2bf933d3da4bff1993a04baeaab5 SHA256 0625896ab5f48fc2561cd7472a200a48ffb1d9aa5ded3f3eed4b9992a51fd473
 DIST Cairo-1.090.tar.gz 105523 RMD160 e1855d884b81df762f1be6301f80c90b27c2d607 SHA1 91c12ece60ee732de375ee06ebcb4b25c2bfa78a SHA256 ea6b53ffbb632035633f89dc096e4fe3ef1d69de09768e5a1a4e78a26f2d6c01
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.08.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.08.ebuild
deleted file mode 100644
index 8f6a4b44f45d..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.08.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.08.ebuild,v 1.3 2010/11/05 13:07:50 hwoarang Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=DAGOLDEN
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/perl-Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.110.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.110.0.ebuild
deleted file mode 100644
index 099fb16b65ec..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.110.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.110.0.ebuild,v 1.1 2011/05/21 07:55:49 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.120.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.120.0.ebuild
deleted file mode 100644
index 961cb68fc7f3..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.120.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.120.0.ebuild,v 1.1 2011/12/02 15:46:12 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.150.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.150.0.ebuild
deleted file mode 100644
index fac718479dbe..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.150.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.150.0.ebuild,v 1.5 2012/03/20 22:06:07 jer Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.15
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.160.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.160.0.ebuild
deleted file mode 100644
index 65c404ec9899..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.160.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.160.0.ebuild,v 1.1 2012/02/13 14:40:52 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.16
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index e9fc97acb72d..0b8c38a98417 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -1,7 +1,2 @@
-DIST Capture-Tiny-0.08.tar.gz 25145 RMD160 83aed66423cd9b547a318aa5372459b0609f71c5 SHA1 adabe5184bb8406b9578f5f6d2136771765247c3 SHA256 7365f880c4e6d5a035fbf9bca1a49ed9b6c52e252e620c757db62181742adc88
-DIST Capture-Tiny-0.11.tar.gz 21060 RMD160 679fd9ca51868867ea716cb46eae593aac037327 SHA1 370492e212497512f50de38ea60f67b42f0fcf06 SHA256 8ca40024c425902d0305076771834278643002e5fe546fb6b8ca6d9f9f743027
-DIST Capture-Tiny-0.12.tar.gz 26122 RMD160 5936e8d8773f8a7fc6e918da86660c1ebdd8d544 SHA1 5bd3a4f8a535fc35f795b077b1d44568fbefb073 SHA256 d4b2cd32dba2e2fca3ed965ebef79178b1874ddd3c2274462839004ba7a87e82
-DIST Capture-Tiny-0.15.tar.gz 27073 RMD160 f9c5e236a6286f2f05aa9bd534084b5b604f31f0 SHA1 96cc2c2b7a90af8b4f35782b7c6b61749c04d843 SHA256 a3dd077f0a300d8d45d579812d99003ce536990231ae867e795ef1ebe7e9553e
-DIST Capture-Tiny-0.16.tar.gz 27610 RMD160 844e6b554573667dfd477360dc914bbd49c57979 SHA1 515ac96d578eecc076840a60f2a14f6929022926 SHA256 f48456acb4ce9a0ba8898dad473e5b1e6b79d6c659f34b0a2486af8d91c61ae8
 DIST Capture-Tiny-0.17.tar.gz 27991 RMD160 d615c779c3f505278477140374d1b5ef1df7c91f SHA1 36114591f9cdd4c1dc0834d7c0b250d2095b6293 SHA256 dc631076374b946f4ad643ee5949bc8b8f2a3644813d1803ca90c077b228d5e0
 DIST Capture-Tiny-0.18.tar.gz 29485 RMD160 450da6c6ee46cca500cbfb236606849179fe938a SHA1 09633bd14ca38d7c91d8c125b05387423a349f97 SHA256 3327997211bb8795cb0496010fd64d9073c636b5ad6d84a1d3bd083560ac5e39
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.31.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.31.ebuild
deleted file mode 100644
index c40bafea369c..000000000000
--- a/dev-perl/Class-Accessor/Class-Accessor-0.31.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.31.ebuild,v 1.6 2008/03/19 02:42:54 jer Exp $
-
-inherit perl-module
-
-DESCRIPTION="Automated accessor generation"
-HOMEPAGE="http://search.cpan.org/~kasei/${P}/"
-SRC_URI="mirror://cpan/authors/id/K/KA/KASEI/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-SRC_TEST="do"
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/Class-Accessor/Manifest b/dev-perl/Class-Accessor/Manifest
index d6fc46649d24..b8450ae30d4a 100644
--- a/dev-perl/Class-Accessor/Manifest
+++ b/dev-perl/Class-Accessor/Manifest
@@ -1,2 +1 @@
-DIST Class-Accessor-0.31.tar.gz 10964 RMD160 72f3f40e7fba2a2a894b53f3ead1404241154833 SHA1 f7925450ca9b567251854e672a3631ccfd20b131 SHA256 3eea2cd932892b104a3ca64576d2e5af32f0543dc416b54cbb7125d7302e9ba8
 DIST Class-Accessor-0.34.tar.gz 12315 RMD160 545371b2656d317cb8eac019e73a7221f2cb71b3 SHA1 e91317b429f5618c4d0264c699a1f266635f87df SHA256 cdb1e0cdf8380fb9b63b44c33ce5afc1068736d55ac5904bf0eaa1efc1c3cefc
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.57.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.57.ebuild
deleted file mode 100644
index 3f551e1a6595..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.57.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.57.ebuild,v 1.5 2012/05/12 16:33:33 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=SHLOMIF
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="test"
-
-RDEPEND="dev-perl/IO-stringy"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.680.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.680.0.ebuild
deleted file mode 100644
index fb121ebe0d57..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.680.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.680.0.ebuild,v 1.2 2012/05/12 16:33:33 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.68
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/IO-stringy"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.36
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.690.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.690.0.ebuild
deleted file mode 100644
index c984ab18fc82..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.690.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.690.0.ebuild,v 1.2 2012/05/12 16:33:33 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.69
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/IO-stringy"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.36
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.700.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.700.0.ebuild
deleted file mode 100644
index 147be1e9f85c..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.700.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.700.0.ebuild,v 1.2 2012/05/12 16:33:33 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.70
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/IO-stringy"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.36
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.720.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.720.0.ebuild
deleted file mode 100644
index d142d213fad1..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.720.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.720.0.ebuild,v 1.2 2012/05/12 16:33:33 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.72
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/IO-stringy
-	dev-perl/List-MoreUtils
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.36
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.730.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.730.0.ebuild
deleted file mode 100644
index 445424a1d891..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.730.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.730.0.ebuild,v 1.1 2012/05/14 17:35:00 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.73
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/IO-stringy
-	dev-perl/List-MoreUtils
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Module-Build-0.36
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-IniFiles/Manifest b/dev-perl/Config-IniFiles/Manifest
index 06af311441f4..d3394f21afc7 100644
--- a/dev-perl/Config-IniFiles/Manifest
+++ b/dev-perl/Config-IniFiles/Manifest
@@ -1,8 +1,2 @@
-DIST Config-IniFiles-2.57.tar.gz 52270 RMD160 e81cb49930bc13f49e2daebdb1b3c6b4869e0260 SHA1 4f2d4dd69fcf16e2c75bc573d444b8463ef7920c SHA256 49a9292ec4a62473f55113f92a404ce0bc45489d732bea1c439087becf0a2f86
-DIST Config-IniFiles-2.68.tar.gz 58255 RMD160 cc1969e9e4775226131371d0f6d4a1dcabe7c9e9 SHA1 eed1c092ed84ebca87ac9e47163bb2192ff5db4a SHA256 46f1d740dca8b02ad26ed8798b2c30308dce4d96b6f3780cb9e489de4d008ea9
-DIST Config-IniFiles-2.69.tar.gz 59418 RMD160 74e443ac08ce6bdfb9362a8a2ae61dabe5ff2c57 SHA1 b7aed763a871a8df9302fbcde5df2ad69da67df2 SHA256 7744b8870ae1cb465a07c12b1d97a121a0374f9eb9677581881f9b5f697fad7f
-DIST Config-IniFiles-2.70.tar.gz 59706 RMD160 495ae466883141dcb02b824e7c2b6cf0e20c6112 SHA1 9cd45602180f39ae2136078ee074f74c7d9fafe2 SHA256 7794fe186fa89dbc395bc11e84550cedeb5884f6253736539c80a548c442fd62
 DIST Config-IniFiles-2.71.tar.gz 60175 RMD160 14cded2ce91786e5383bd355fdce0b57c8db4bdb SHA1 37cbca2241178b1343b1bc13bfb959080986d450 SHA256 853b97d6e33f4a63c121408d9aed1a85597de95d0769ec249e1739dfe51c42c4
-DIST Config-IniFiles-2.72.tar.gz 61256 RMD160 f53fe6fc42cadf0b2c7418d92cc106b5aa76d33f SHA1 5cd0ecb4f5993c3044080049fca7559733b69c8c SHA256 6ec0a7fee53d47ca03f6f52c05dbe4c0f2788b6fe7b1f765c40a34cd81e80b91
-DIST Config-IniFiles-2.73.tar.gz 61598 RMD160 c87b5796562b853340ad7f3a56ad2b1c112e1fcd SHA1 6d2c86d02b5959dc56872cfae2c1b7373b9ca833 SHA256 542515be2ff719d7ea56cf6842a59dbf8d1e45351c5fa6079e9c14571f989113
 DIST Config-IniFiles-2.75.tar.gz 62973 RMD160 198cda76cb9867f3328b1b2d2ad3e611927e4237 SHA1 76b0cc9fe110d1f828967652c0dca6511730f94d SHA256 503bd5923dbed3940a77d59868ce6fdf956f6aa6faf9105e4feeec0101ef9626
diff --git a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.10.ebuild b/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.10.ebuild
deleted file mode 100644
index 0e44a54db9c0..000000000000
--- a/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.10.ebuild,v 1.12 2010/01/09 18:24:23 grobian Exp $
-
-inherit perl-module
-
-DESCRIPTION="Crypt::Blowfish module for perl"
-HOMEPAGE="http://search.cpan.org/~dparis/"
-SRC_URI="mirror://cpan/authors/id/D/DP/DPARIS/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-SRC_TEST="do"
-
-DEPEND=">=dev-lang/perl-5"
-
-export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Crypt-Blowfish/Manifest b/dev-perl/Crypt-Blowfish/Manifest
index 770780f4c681..b83aeaa072ac 100644
--- a/dev-perl/Crypt-Blowfish/Manifest
+++ b/dev-perl/Crypt-Blowfish/Manifest
@@ -1,2 +1 @@
-DIST Crypt-Blowfish-2.10.tar.gz 17623 RMD160 35ab9f62022521c28650cd2ddb11348aaeee011a SHA1 793bc598dfdd5e647f0615c3db50e9e8ca25e39c SHA256 b984751c6902573ad7805c1463d8d1d0d58f5d2d20c13100dca3edfa61d8d7eb
 DIST Crypt-Blowfish-2.12.tar.gz 17895 RMD160 6ebc9fd880b6f18c9f9ea5e20e4da10a04a53a6e SHA1 d4712fc05559f8b6aef9d901e115bba2cd368a5f SHA256 7b54eb96e2e91ca83b7b4099a2ff9a21986ec8e6bf4804245376ebed98e23ac4
diff --git a/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.5.ebuild b/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.5.ebuild
deleted file mode 100644
index ed04c384dab4..000000000000
--- a/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.5.ebuild,v 1.5 2012/05/28 15:58:45 armin76 Exp $
-
-EAPI=3
-
-MODULE_AUTHOR="DANIEL"
-inherit perl-module
-
-DESCRIPTION="Perl interface to Alec Muffett's Cracklib"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="sys-libs/cracklib"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Pod-Coverage
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Crypt-Cracklib/Manifest b/dev-perl/Crypt-Cracklib/Manifest
index 1bf464532299..c1c4603cff97 100644
--- a/dev-perl/Crypt-Cracklib/Manifest
+++ b/dev-perl/Crypt-Cracklib/Manifest
@@ -1,2 +1 @@
-DIST Crypt-Cracklib-1.5.tar.gz 19690 RMD160 5fb970c303a6abf37c0df900d8aa89c40603de61 SHA1 75244500e5f59c31de67a43ec0b21df2c3c7d1d7 SHA256 ba114b6324bc1d78a25d1001f243a284130e066c59e0dc776ad5edf76a4a4c46
 DIST Crypt-Cracklib-1.7.tar.gz 27529 RMD160 aa04206363c3a578bbb1c0abc984b5be626c9e7e SHA1 50a7ef202fd576b1c6dff5ec7a7e0f509644020c SHA256 cf864ddffaec6b4697bd4e53030f320166c69c3b3aebf79ce25b9af30228567f
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.22.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-1.22.ebuild
deleted file mode 100644
index d66d78ff3d03..000000000000
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.22.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-StackTrace/Devel-StackTrace-1.22.ebuild,v 1.9 2010/01/09 19:38:14 grobian Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=DROLSKY
-inherit perl-module
-
-DESCRIPTION="Devel-StackTrace module for perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="virtual/perl-File-Spec"
-DEPEND=">=virtual/perl-Module-Build-0.28
-	${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Devel-StackTrace/Manifest b/dev-perl/Devel-StackTrace/Manifest
index eca5bbbb10a0..862658a16327 100644
--- a/dev-perl/Devel-StackTrace/Manifest
+++ b/dev-perl/Devel-StackTrace/Manifest
@@ -1,2 +1 @@
-DIST Devel-StackTrace-1.22.tar.gz 20464 RMD160 a15fa2ca593e3fb0f0f304640065719e26ef0a03 SHA1 4954176b59fecd53cc2496716df49db4290b6174 SHA256 ff7b80d9be02279732de6c9797149b6c16f73066a4e80a221a83d7b475917eeb
 DIST Devel-StackTrace-1.27.tar.gz 18462 RMD160 d69acbac09e3d211363738625180f2fc79e8f698 SHA1 2be3206443832bab6a8cd3ea995cdec983e16d7c SHA256 da55edfd4fa20ee88c94dd36ff53890d3a27095a8305d4e812a84459595ae706
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.01-r1.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.01-r1.ebuild
deleted file mode 100644
index e9f1b944fb81..000000000000
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.01-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-HMAC/Digest-HMAC-1.01-r1.ebuild,v 1.30 2011/07/30 10:28:04 tove Exp $
-
-inherit perl-module
-
-DESCRIPTION="Keyed Hashing for Message Authentication"
-HOMEPAGE="http://search.cpan.org/doc/GAAS/"
-SRC_URI="mirror://cpan/authors/id/GAAS/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="virtual/perl-digest-base
-	virtual/perl-Digest-MD5
-	dev-perl/Digest-SHA1
-	dev-lang/perl"
-
-SRC_TEST="do"
-
-mydoc="rfc*.txt"
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.02.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.02.ebuild
deleted file mode 100644
index 48bb40bd429d..000000000000
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.02.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-HMAC/Digest-HMAC-1.02.ebuild,v 1.4 2011/07/30 10:28:04 tove Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=GAAS
-inherit perl-module
-
-DESCRIPTION="Keyed Hashing for Message Authentication"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-Digest-MD5
-	dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild
index b52e9524166e..4df58714e391 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild,v 1.11 2012/05/05 23:44:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0.ebuild,v 1.12 2012/06/03 18:47:39 tove Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-Digest-MD5
diff --git a/dev-perl/Digest-HMAC/Manifest b/dev-perl/Digest-HMAC/Manifest
index d84d3cd395eb..c445ceda8038 100644
--- a/dev-perl/Digest-HMAC/Manifest
+++ b/dev-perl/Digest-HMAC/Manifest
@@ -1,3 +1 @@
-DIST Digest-HMAC-1.01.tar.gz 13623 RMD160 44386a18bc9bbe6513c647bb20ccb0fd4dcebc17 SHA1 808d33f87874d87842d377aa49b302dfc1126691 SHA256 e373a62ea6786932bd2c49ae3dd679bb422d368259abe235ee2c1666a7354d10
-DIST Digest-HMAC-1.02.tar.gz 6989 RMD160 f2002d1b1b595e8f03d8568b7ff4b98a8173052c SHA1 359cc36c7252bfb9a4db7ec8de4c01eeda1767a1 SHA256 d0043b2fb5d38b571c11afbb424a1e6952b0f230da68525b14e8435830fd02f1
 DIST Digest-HMAC-1.03.tar.gz 7251 RMD160 76f10c0a4497d1a8c0faf685ed0dd7e3f86e818a SHA1 b3f931032a9a8d9ba42d1c5d4684b06e60e183c7 SHA256 3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59
diff --git a/dev-perl/File-Remove/File-Remove-1.42.ebuild b/dev-perl/File-Remove/File-Remove-1.42.ebuild
deleted file mode 100644
index 8dcfc3f80e03..000000000000
--- a/dev-perl/File-Remove/File-Remove-1.42.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-1.42.ebuild,v 1.9 2012/05/06 17:51:43 armin76 Exp $
-
-MODULE_AUTHOR=ADAMK
-inherit perl-module
-
-DESCRIPTION="Remove files and directories"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-DEPEND=">=virtual/perl-File-Spec-0.84
-	dev-lang/perl"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Remove/File-Remove-1.500.0.ebuild b/dev-perl/File-Remove/File-Remove-1.500.0.ebuild
deleted file mode 100644
index 5112598879c0..000000000000
--- a/dev-perl/File-Remove/File-Remove-1.500.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-1.500.0.ebuild,v 1.3 2012/05/06 17:51:43 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=${PV%0.0}
-inherit perl-module
-
-DESCRIPTION="Remove files and directories"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/perl-File-Spec-0.84"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index 1cebdd21cbf4..97d37a408622 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -1,4 +1,2 @@
-DIST File-Remove-1.42.tar.gz 27592 RMD160 4dbc9d092e436984c876126fe716027a9a5ff8b5 SHA1 09d2bf0d6a86155e17fe4a82e177d5f1c31d39e2 SHA256 2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504
-DIST File-Remove-1.50.tar.gz 36224 RMD160 06424c49e6b2b625fa7ca7a54eb21596445927f0 SHA1 13c3ca54d946c77c9df9e8624b74bb4d72b91f30 SHA256 3e712fc9cd0605610e992aaf9bbe05aea53dae2b4076bb1f5ac07065ad6a2293
 DIST File-Remove-1.51.tar.gz 36904 RMD160 d176fbe63aa62cc1cbcc86996483d8de2374aff0 SHA1 7a2e6f2e993dd0bcb9872baf04fee621fe111f13 SHA256 edf68d44a05b330e04677b9f861fcfe17f0263fe6f88058f5fcd9fd00533fdeb
 DIST File-Remove-1.52.tar.gz 38230 RMD160 968344ad7b06b574fff9567e1755a0047a79ad05 SHA1 35594cf6bbdb36d9082167f578d3a7f0b51f5dae SHA256 4154dc574b8a9a3a555d323f152ac742363c6a69c1f61de15b72728813550bdd
diff --git a/dev-perl/Fuse/Fuse-0.08.ebuild b/dev-perl/Fuse/Fuse-0.08.ebuild
deleted file mode 100644
index 228d4b8b023a..000000000000
--- a/dev-perl/Fuse/Fuse-0.08.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Fuse/Fuse-0.08.ebuild,v 1.4 2008/09/30 13:01:31 tove Exp $
-
-MODULE_AUTHOR=DPAVLIN
-inherit perl-module
-
-DESCRIPTION="Fuse module for perl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-fs/fuse
-	dev-lang/perl"
-
-# Test is whack - ChrisWhite
-#SRC_TEST="do"
diff --git a/dev-perl/Fuse/Fuse-0.130.0.ebuild b/dev-perl/Fuse/Fuse-0.130.0.ebuild
deleted file mode 100644
index 19e8f28ed452..000000000000
--- a/dev-perl/Fuse/Fuse-0.130.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Fuse/Fuse-0.130.0.ebuild,v 1.1 2011/07/16 08:11:01 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DPAVLIN
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Fuse module for perl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-# Test is whack - ChrisWhite
-#SRC_TEST="do"
diff --git a/dev-perl/Fuse/Manifest b/dev-perl/Fuse/Manifest
index 199f3ec64391..75a4a8490cd0 100644
--- a/dev-perl/Fuse/Manifest
+++ b/dev-perl/Fuse/Manifest
@@ -1,4 +1,2 @@
-DIST Fuse-0.08.tar.gz 20389 RMD160 4b55c26d867eebccca75ac8f8b05e272466941fb SHA1 df0e545fe43a1ccc5d7f470834504a0657c2dd18 SHA256 6613b4ab0e7f82dd5c430433e40c1044b39819b664841359db1b69360794debd
-DIST Fuse-0.13.tar.gz 30089 RMD160 1fee97a8ea8ac4e4db3419b659cfa6beeabdcac4 SHA1 a211a4527e987e88a402a0b96657e945ce497f08 SHA256 7ae8b37381d2eba1dc143b9aa2baca1ca1f74caef5aca9d213baf3328a7ea239
 DIST Fuse-0.14.tar.gz 30486 RMD160 fe5c7c81f2f99f9ba5d93a87c7a812d9fa2c63f2 SHA1 0e9a4169979d947ff5741d9462f7b505a9982a70 SHA256 bbdd8e3933f87798736f85c2a21ad9857b2c6b2323537369cec139d6cd06da5b
 DIST Fuse-0.15.tar.gz 37698 RMD160 270faf5dd95529c3b5353c1016c85328b6eeeeb5 SHA1 fc1f00161dae07102889136da6f2eb7c23fd9908 SHA256 8ccde0def73c489fada0462e42eeb3570dfb60193d4d1b21a3b5b8432db7daba
diff --git a/dev-perl/GStreamer-Interfaces/GStreamer-Interfaces-0.04.ebuild b/dev-perl/GStreamer-Interfaces/GStreamer-Interfaces-0.04.ebuild
deleted file mode 100644
index 86b25d9c05dd..000000000000
--- a/dev-perl/GStreamer-Interfaces/GStreamer-Interfaces-0.04.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GStreamer-Interfaces/GStreamer-Interfaces-0.04.ebuild,v 1.4 2012/05/04 04:10:57 jdhore Exp $
-
-inherit perl-module
-
-DESCRIPTION="Perl interface to the GStreamer Interfaces library"
-HOMEPAGE="http://search.cpan.org/~tsch"
-SRC_URI="mirror://cpan/authors/id/T/TS/TSCH/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=media-libs/gst-plugins-base-0.10*
-	>=dev-perl/GStreamer-0.06
-	>=dev-perl/glib-perl-1.180"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205
-	>=dev-perl/extutils-pkgconfig-1.07
-	virtual/pkgconfig"
diff --git a/dev-perl/GStreamer-Interfaces/Manifest b/dev-perl/GStreamer-Interfaces/Manifest
index 90c6de6fd58f..25cec3762d7c 100644
--- a/dev-perl/GStreamer-Interfaces/Manifest
+++ b/dev-perl/GStreamer-Interfaces/Manifest
@@ -1,2 +1 @@
-DIST GStreamer-Interfaces-0.04.tar.gz 14370 RMD160 3a1f595364cb4f4727c8063a1098fc1ba896f179 SHA1 57fb9ae3df82a3c28f0a8a9aa9a6e627713f91f0 SHA256 ec8a69b68e9c13f05fd8141dcfd153a8b4163b1fb86ae730ed3cf218a536b586
 DIST GStreamer-Interfaces-0.06.tar.gz 16459 RMD160 22a631815652c9c96f1c2a2b60149b326852a9f4 SHA1 a604c2a0e28a032930223d6ae70d900b54a639dc SHA256 fe0ea7305d6e33ef854fd3de7908b6985d562a111cf0694374b4fb09caeeb16b
diff --git a/dev-perl/GStreamer/GStreamer-0.09.ebuild b/dev-perl/GStreamer/GStreamer-0.09.ebuild
deleted file mode 100644
index edee09220b1b..000000000000
--- a/dev-perl/GStreamer/GStreamer-0.09.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GStreamer/GStreamer-0.09.ebuild,v 1.7 2012/05/04 04:10:56 jdhore Exp $
-
-inherit perl-module
-
-DESCRIPTION="Perl bindings for GStreamer"
-HOMEPAGE="http://search.cpan.org/~tsch/"
-SRC_URI="mirror://cpan/authors/id/T/TS/TSCH/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=media-libs/gstreamer-0.10*
-	>=dev-perl/glib-perl-1.120"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205
-	>=dev-perl/extutils-pkgconfig-1.07
-	virtual/pkgconfig"
diff --git a/dev-perl/GStreamer/GStreamer-0.160.0.ebuild b/dev-perl/GStreamer/GStreamer-0.160.0.ebuild
deleted file mode 100644
index 3e65563ad3e2..000000000000
--- a/dev-perl/GStreamer/GStreamer-0.160.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GStreamer/GStreamer-0.160.0.ebuild,v 1.2 2012/05/04 04:10:56 jdhore Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=0.16
-inherit perl-module
-
-DESCRIPTION="Perl bindings for GStreamer"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=media-libs/gstreamer-0.10*
-	>=dev-perl/glib-perl-1.180"
-DEPEND="${RDEPEND}
-	>=dev-perl/extutils-depends-0.205
-	>=dev-perl/extutils-pkgconfig-1.07
-	virtual/pkgconfig"
diff --git a/dev-perl/GStreamer/Manifest b/dev-perl/GStreamer/Manifest
index 41ab3d646131..38167134e8a1 100644
--- a/dev-perl/GStreamer/Manifest
+++ b/dev-perl/GStreamer/Manifest
@@ -1,3 +1 @@
-DIST GStreamer-0.09.tar.gz 64433 RMD160 463aeb40b996c320a5d01f8714ea830c8c1cd79e SHA1 6b8443868fd9ce480d8d81cd2464fbbc04bbb10e SHA256 f9fd09486fd2d7a849759c118493b711244a559927dadda6340c8f618e9fd111
-DIST GStreamer-0.16.tar.gz 68262 RMD160 0fe7fc918e5118f41ea2fe1caca4ba3611a34bb8 SHA1 2aaea92cdf53d128e3899bb322f529d4e45db669 SHA256 000099a4a32e4643c0cf1fd9659ee041a4562280a92144290d61552f07b13de3
 DIST GStreamer-0.17.tar.gz 68761 RMD160 eeeb23d51b30a131dbcec2720410780cf45cd61a SHA1 7baffb86fd589c0bdc4a37ffda42889d1a5a4d6d SHA256 49195018f5d7ca60379f8b5ede0afe344ea029ac00f206adf63330094dae66d4
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.42.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.42.ebuild
deleted file mode 100644
index 83fe862147b7..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.42.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GnuPG-Interface/GnuPG-Interface-0.42.ebuild,v 1.12 2012/05/28 16:05:39 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=JESSE
-inherit perl-module
-
-DESCRIPTION="GnuPG::Interface is a Perl module interface to interacting with GnuPG."
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=app-crypt/gnupg-1.2.1-r1
-	dev-perl/Any-Moose"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.440.0.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.440.0.ebuild
deleted file mode 100644
index d8131a2852c0..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.440.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GnuPG-Interface/GnuPG-Interface-0.440.0.ebuild,v 1.2 2012/05/28 16:05:39 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=JESSE
-MODULE_VERSION=0.44
-inherit perl-module
-
-DESCRIPTION="GnuPG::Interface is a Perl module interface to interacting with GnuPG."
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=app-crypt/gnupg-1.2.1-r1
-	>=virtual/perl-Math-BigInt-1.78
-	dev-perl/Any-Moose"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 99d7fc2eb5a0..e5207d61725a 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1,3 +1 @@
-DIST GnuPG-Interface-0.42.tar.gz 59861 RMD160 682c0c90f5d3cd2aa7957b609efa6f340672ae8b SHA1 42aa71e5972b4d81207c6b08805d10a5fc8839ab SHA256 1a37b30324f29d2f9a1cf69e560a358bdcc004cdec044b2276cc0877ac07a423
-DIST GnuPG-Interface-0.44.tar.gz 67458 RMD160 34e87f1b3efe3abfa6010c5315f38581d014b969 SHA1 2e80d9a99615054dfd3f3ca2610eae4355ac2281 SHA256 036c159549fa142d2757faa4d23976d33c9f0b2e72daa741b1c85e6a7390b335
 DIST GnuPG-Interface-0.45.tar.gz 67148 RMD160 0e5aef93e84a58daae6aa09901a699b930e19e04 SHA1 1d34cc20ea538804a8c5dbb3aec1e11862724f90 SHA256 807275bc9415840430e9af3aa190a4a2a73dd54b7316b313e3b4b1ae1c500e23
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.38.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.38.ebuild
deleted file mode 100644
index 33edf029e520..000000000000
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.38.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-DAV/HTTP-DAV-0.38.ebuild,v 1.6 2012/05/28 16:00:56 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=OPERA
-inherit perl-module
-
-DESCRIPTION="A WebDAV client library for Perl5"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-perl/libwww-perl
-	dev-perl/XML-DOM"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.460.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.460.0.ebuild
deleted file mode 100644
index 7201600eba2a..000000000000
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.460.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-DAV/HTTP-DAV-0.460.0.ebuild,v 1.2 2012/05/28 16:00:56 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=COSIMO
-MODULE_VERSION=0.46
-inherit perl-module
-
-DESCRIPTION="A WebDAV client library for Perl5"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-DOM
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-DAV/Manifest b/dev-perl/HTTP-DAV/Manifest
index cac3be875a91..e69c5fc59850 100644
--- a/dev-perl/HTTP-DAV/Manifest
+++ b/dev-perl/HTTP-DAV/Manifest
@@ -1,3 +1 @@
-DIST HTTP-DAV-0.38.tar.gz 98187 RMD160 751679a03b6ce184929b17274e79d873e510a352 SHA1 fcfc4cd3a592b539e27a44eb1915ab1910c9eca7 SHA256 860cd7d2de26b22b08b4fcd99ba8ec2e718e7a50beca984c49833ef61628e645
-DIST HTTP-DAV-0.46.tar.gz 109395 RMD160 e3049da4d9628230193a0096539056d5545737ba SHA1 a1113b65856b7a148dbd255e582dd463d9a6586a SHA256 f5077e3796750bd46ca4d262e463090c36c6292e2ac99488608a72d88db1fc5b
 DIST HTTP-DAV-0.47.tar.gz 109648 RMD160 a3a52616da15d9f9a34ab1fd9a1cf113527a0338 SHA1 884c437ef0b8867dcc3413c753fd341195001574 SHA256 30db3e3b55be32052bf724e2c09acf1b1a11ebf6c701261ef3f5ffe4ed2ab42a
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.63.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.63.ebuild
deleted file mode 100644
index 79825b499b9b..000000000000
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.63.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.63.ebuild,v 1.7 2010/10/22 19:22:22 ssuominen Exp $
-
-EAPI=3
-
-MODULE_AUTHOR="SHLOMIF"
-inherit perl-module
-
-DESCRIPTION="Work with IO sockets in ipv6"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Socket6"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build"
-
-# Disabling tests since they seem to be more trouble than worth, esp. in re bug
-# 115004
-#SRC_TEST="do"
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.670.0.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.670.0.ebuild
deleted file mode 100644
index 3efd89f3cb28..000000000000
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.670.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.670.0.ebuild,v 1.1 2011/08/30 13:27:43 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.67
-inherit perl-module
-
-DESCRIPTION="Work with IO sockets in ipv6"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Socket6"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build"
-
-# Disabling tests since they seem to be more trouble than worth, esp. in re bug
-# 115004
-#SRC_TEST="do"
diff --git a/dev-perl/IO-Socket-INET6/Manifest b/dev-perl/IO-Socket-INET6/Manifest
index 4d8e156407b5..c9eb1dc63c85 100644
--- a/dev-perl/IO-Socket-INET6/Manifest
+++ b/dev-perl/IO-Socket-INET6/Manifest
@@ -1,3 +1 @@
-DIST IO-Socket-INET6-2.63.tar.gz 17393 RMD160 74ed4a705895054c45ff094dee53e807b30e3a5b SHA1 aec98fb4066414ec47e35eb9caba3b22463f87a8 SHA256 c49ae638aabe292ccd3bf9b74b57bff32f68871a7977e0f42ff8b9031f5f898f
-DIST IO-Socket-INET6-2.67.tar.gz 18096 RMD160 68186996e1c75724a33eb383e24f8761440dc3a6 SHA1 498eeeb0b0c135665d962dfa94c41c075141949e SHA256 dd90e417cbd37047b71469ec99e79fe89a3bb5103769fc9c76b3c87d8cb019b2
 DIST IO-Socket-INET6-2.69.tar.gz 18603 RMD160 4a27f99ec5c3e216de25a18a2ee687bbd82b01fd SHA1 821f574d51be0449f247f457034face990b7cf9c SHA256 accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045
diff --git a/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild b/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild
index 528a952d509e..f4f7d5374d91 100644
--- a/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild
+++ b/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild,v 1.2 2011/09/03 21:04:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Signal/IPC-Signal-1.0.0.ebuild,v 1.3 2012/06/04 02:06:55 xmw Exp $
 
 EAPI=4
 
@@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="Translate signal names to/from numbers"
 
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ia64 ppc sparc x86"
 IUSE=""
diff --git a/dev-perl/JSON/JSON-2.27.ebuild b/dev-perl/JSON/JSON-2.27.ebuild
deleted file mode 100644
index fd61b8a8baff..000000000000
--- a/dev-perl/JSON/JSON-2.27.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON/JSON-2.27.ebuild,v 1.7 2012/05/06 17:58:54 armin76 Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=MAKAMAKA
-inherit perl-module
-
-DESCRIPTION="parse and convert to JSON (JavaScript Object Notation)"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest
index 9f97b154b49f..e6128c02b9d1 100644
--- a/dev-perl/JSON/Manifest
+++ b/dev-perl/JSON/Manifest
@@ -1,2 +1 @@
-DIST JSON-2.27.tar.gz 76579 RMD160 4a904cacbad5e0d284ed30db4fab1d16abc91000 SHA1 69daaf59068072bb72ef384d228c745dcdd4ce53 SHA256 8dbe3a84f783c37fea9baf55ef512dd0b28009d3a7448562be46af323c9388f7
 DIST JSON-2.53.tar.gz 84391 RMD160 d330285f25e75ce63dbea73e23713ab3a7e226f9 SHA1 a56cd4155ddad0e55bbef588207c3fd85e13c271 SHA256 90de181e583d105a1086da4fe961ceacf39217f5ea7b3c8d886a5ed04ed0d565
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.25.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.25.ebuild
deleted file mode 100644
index a3b948d68341..000000000000
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.25.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/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.25.ebuild,v 1.6 2011/02/27 18:30:31 ranger Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=PLOBBES
-inherit perl-module eutils
-
-DESCRIPTION="IMAP client module for Perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Parse-RecDescent-1.94"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod )"
-#		>=virtual/perl-File-Temp-0.18 )"
-		# only used in t/basic.t
-
-SRC_TEST="do"
-
-mydoc="FAQ"
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.290.0.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.290.0.ebuild
deleted file mode 100644
index e043af596d99..000000000000
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.290.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.290.0.ebuild,v 1.1 2011/08/16 16:54:05 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=PLOBBES
-MODULE_VERSION=3.29
-inherit perl-module
-
-DESCRIPTION="IMAP client module for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Parse-RecDescent-1.94"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod )"
-#		>=virtual/perl-File-Temp-0.18 )"
-		# only used in t/basic.t
-
-SRC_TEST="do"
diff --git a/dev-perl/Mail-IMAPClient/Manifest b/dev-perl/Mail-IMAPClient/Manifest
index 1e9b9fcfc795..40ddd5f6c158 100644
--- a/dev-perl/Mail-IMAPClient/Manifest
+++ b/dev-perl/Mail-IMAPClient/Manifest
@@ -1,4 +1,2 @@
-DIST Mail-IMAPClient-3.25.tar.gz 188252 RMD160 67378c53235d8df9a3ecfa72800e443aacc34da5 SHA1 da0713c4e800c359b472d5107c09055f0178d5ad SHA256 aa38c4bf35c0bce280e7822cd218631123dbc94107905c1eeaf43a6b89244273
-DIST Mail-IMAPClient-3.29.tar.gz 181402 RMD160 f5179ecc02d27e499fe1bcf0981079fc09fb229e SHA1 9eafbc6c7f57b9f64e5c98fd895404a961098395 SHA256 01ae878aa5961d82c95b7a2e746c4bc370abc9acdef647d0a07609472f07ce87
 DIST Mail-IMAPClient-3.30.tar.gz 183267 RMD160 8b50c91c3724ad6dd6e64af9ca003ef238893823 SHA1 c8f43e53bc77eb28c34829065d1a768bfb6d9004 SHA256 14ba2b1066d6c4fc589758243caea8d21fcd6ec1c7ca49eea8075b611a59e492
 DIST Mail-IMAPClient-3.31.tar.gz 183647 RMD160 31a1e16a92cd1fe99ea99481e2f9471d00e245ce SHA1 11b066d5899590d64c24f674feee9e2ff6fd1bcc SHA256 68059868e52733fafa46fd2a401d56a4ef77d8d8cf2708170a04bcf385f3306c
diff --git a/dev-perl/Module-Refresh/Manifest b/dev-perl/Module-Refresh/Manifest
index 0254fe3b4737..4e8e773b363f 100644
--- a/dev-perl/Module-Refresh/Manifest
+++ b/dev-perl/Module-Refresh/Manifest
@@ -1,3 +1 @@
-DIST Module-Refresh-0.13.tar.gz 11666 RMD160 0a1127f6f043fc0b471da5d2d82fd62f831a0bbd SHA1 a7f0dc88312c863bd873c67e7ce414b485c05388 SHA256 7ed6f399e1302ad6de6775453129df422bae8834cc3d40266d0bf56f81bbb2d9
-DIST Module-Refresh-0.16.tar.gz 12228 RMD160 d6e14efb53fb63b763544f907e9b547577563b98 SHA1 d5c3dd638c985b4c43db456524f5cac8d367af87 SHA256 dabc7419d568479eee66a8b0873d27fc2dba0c1bc661ee916eae690669039f87
 DIST Module-Refresh-0.17.tar.gz 22586 RMD160 4f3528a099236c6cee3bcb6711fae2aee6de1906 SHA1 4bf652127661d1c8f11ff3334bfc75ecc5ab2cfa SHA256 6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3
diff --git a/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild b/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild
deleted file mode 100644
index b84e93823bb9..000000000000
--- a/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild,v 1.7 2012/05/26 18:58:48 armin76 Exp $
-
-MODULE_AUTHOR=JESSE
-inherit perl-module
-
-DESCRIPTION="Refresh %INC files when updated on disk"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"
-
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/Module-Refresh/Module-Refresh-0.160.0.ebuild b/dev-perl/Module-Refresh/Module-Refresh-0.160.0.ebuild
deleted file mode 100644
index 3e24d4749964..000000000000
--- a/dev-perl/Module-Refresh/Module-Refresh-0.160.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.160.0.ebuild,v 1.2 2012/05/26 18:58:48 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=JESSE
-MODULE_VERSION=0.16
-inherit perl-module
-
-DESCRIPTION="Refresh %INC files when updated on disk"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="test? ( dev-perl/Path-Class )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index 60ef41059808..f4a5a5f5e1ec 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,4 +1,2 @@
-DIST Mouse-0.40.tar.gz 148001 RMD160 588841ea7a2822c50374e20a7270401e55dca290 SHA1 d41373ac10ee1914f21aefaf1636e80e9c8bf7fe SHA256 5bf1f9f56c122b2d27f0c2e437759b6bb19428898dbdf556cc96314720990407
 DIST Mouse-0.64-ppport.h.bz2 39634 RMD160 0fc8bc05235db2a06d650f5c5fde81d65c72f6d7 SHA1 36a0e53d4a662a671ab91b418bf273efe5a60cd7 SHA256 adbd5a9eb45a677b948b9c119815977df82981991dfd66b2eecb44a47ff61c7a
-DIST Mouse-0.93.tar.gz 231444 RMD160 26d21b1d5f7e6ec753fef13b1a91d86a744c18f9 SHA1 36ce654b351237d452c2b8b90d03d1ff5a1586f3 SHA256 f3c1b150c69010578f769eff79f9efb75b0a6d14a81e1653e19a6df0eb389385
 DIST Mouse-0.97.tar.gz 229149 RMD160 4be9e12a2c860098131989ef0ee52da131a940c1 SHA1 12d785e2c8821c52ee0714c94cc3614112cfe7a2 SHA256 dfb1f3abbc46e7646a685efa4e5804c4cf9772eb807ac6abf8f1d1529b57b97a
diff --git a/dev-perl/Mouse/Mouse-0.40.ebuild b/dev-perl/Mouse/Mouse-0.40.ebuild
deleted file mode 100644
index 5b1652e6c104..000000000000
--- a/dev-perl/Mouse/Mouse-0.40.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mouse/Mouse-0.40.ebuild,v 1.6 2012/05/28 16:07:40 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=GFUJI
-inherit perl-module
-
-DESCRIPTION="Moose minus the antlers"
-
-SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="test? ( dev-perl/Sub-Uplevel
-	dev-perl/Test-Exception
-	>=virtual/perl-Test-Simple-0.88 )"
-
-SRC_TEST=do
diff --git a/dev-perl/Mouse/Mouse-0.930.0.ebuild b/dev-perl/Mouse/Mouse-0.930.0.ebuild
deleted file mode 100644
index e4560b0127ca..000000000000
--- a/dev-perl/Mouse/Mouse-0.930.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mouse/Mouse-0.930.0.ebuild,v 1.2 2012/05/28 16:07:40 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=GFUJI
-MODULE_VERSION=0.93
-inherit eutils perl-module
-
-DESCRIPTION="Moose minus the antlers"
-SRC_URI+=" mirror://gentoo/Mouse-0.64-ppport.h.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
-IUSE="test"
-
-RDEPEND="virtual/perl-XSLoader"
-DEPEND=">=virtual/perl-ExtUtils-ParseXS-2.21
-	test? ( dev-perl/Sub-Uplevel
-		>=virtual/perl-Test-Simple-0.88 )"
-
-src_prepare() {
-	perl-module_src_prepare
-	epatch "${FILESDIR}"/0.64-ppport.patch
-	mv "${WORKDIR}"/Mouse-0.64-ppport.h "${S}"/ppport.h || die
-}
-
-SRC_TEST=do
diff --git a/dev-perl/Net-CUPS/Manifest b/dev-perl/Net-CUPS/Manifest
index 66c92266dd7f..df9ed6570ac2 100644
--- a/dev-perl/Net-CUPS/Manifest
+++ b/dev-perl/Net-CUPS/Manifest
@@ -1,2 +1 @@
-DIST Net-CUPS-0.59.tar.gz 70705 RMD160 6b3eb315dbefc02d14095159fc15770ac45f6ac4 SHA1 e18fd3157caa937be220dcace23dbeee01ddce85 SHA256 42acf40390b5c75fa7cc63c636f2797c4d96385b14108fcd683fdc98e43a9d3c
 DIST Net-CUPS-0.61.tar.gz 83893 RMD160 c3dcf15fefc83985e79bb47439d485a5f956f854 SHA1 48240df335169950853ec30caa4be8733af2b48b SHA256 fd4a5a86038df9dfe57dcfed78b2d045e4b18d507a6fa5a8f82ecb3a732e0e35
diff --git a/dev-perl/Net-CUPS/Net-CUPS-0.59.ebuild b/dev-perl/Net-CUPS/Net-CUPS-0.59.ebuild
deleted file mode 100644
index 05bef0e9b11b..000000000000
--- a/dev-perl/Net-CUPS/Net-CUPS-0.59.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/Net-CUPS-0.59.ebuild,v 1.4 2012/05/06 16:44:45 armin76 Exp $
-
-MODULE_AUTHOR=DHAGEMAN
-inherit perl-module
-
-DESCRIPTION="CUPS C API Interface"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-SRC_TEST="do"
-
-RDEPEND=">=net-print/cups-1.1.21
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )"
diff --git a/dev-perl/PDF-API2/Manifest b/dev-perl/PDF-API2/Manifest
index 5c8105024406..56e6d21dc235 100644
--- a/dev-perl/PDF-API2/Manifest
+++ b/dev-perl/PDF-API2/Manifest
@@ -1,2 +1 @@
-DIST PDF-API2-0.57.tar.gz 6651168 RMD160 3feeac9a3247bd8576a7c247fe9896c0843dff76 SHA1 15e2fb896675c7fe49954cb08bc922e8538c9f9c SHA256 5ab5f476c455d3df52c5dac9ee81059dd165268d468c4a5bc756dc6589ead1dd
 DIST PDF-API2-2.019.tar.gz 3496615 RMD160 e4e5c37c37aa6484f1741e9704df8333dbb56e98 SHA1 794de9d6d83e8d0ae04b6c1c314238411d151aa8 SHA256 93385cf3d6b74583195572c0018706e4f7ab95c81f1ab50efc46b18dec44bc13
diff --git a/dev-perl/PDF-API2/PDF-API2-0.57.ebuild b/dev-perl/PDF-API2/PDF-API2-0.57.ebuild
deleted file mode 100644
index fd5d00cdf2cc..000000000000
--- a/dev-perl/PDF-API2/PDF-API2-0.57.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDF-API2/PDF-API2-0.57.ebuild,v 1.4 2009/07/19 17:42:57 tove Exp $
-
-inherit perl-module
-
-DESCRIPTION="A Perl Module Chain to faciliate the Creation and Modification of High-Quality \"Portable Document Format (aka. PDF)\" Files"
-SRC_URI="mirror://cpan/authors/id/A/AR/AREIBENS/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/~areibens/"
-
-SLOT="0"
-LICENSE="|| ( Artistic LGPL-2 )"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-SRC_TEST="do"
-
-DEPEND="virtual/perl-IO-Compress
-		dev-lang/perl"
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index dadda74cc54f..421d98eb30d5 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -1,2 +1 @@
-DIST PPI-1.212.tar.gz 226491 RMD160 5f96dd8aca996bb712b6415e7040136c4212cb8f SHA1 207b8551030fae6252ea9b286810da181604c156 SHA256 11007c3e4c2982c61bbd851fdd8d447cb2e417738d320d75537dca4898aed717
 DIST PPI-1.215.tar.gz 228887 RMD160 7a8253443a795428dc3ae6a831fef3b8be753175 SHA1 58fd00fcd5efaa625a18e2662ba1ea6ad8657b31 SHA256 db238e84da705b952b69f25554019ce70124079a0ad43713d0638aa14ba54878
diff --git a/dev-perl/PPI/PPI-1.212.ebuild b/dev-perl/PPI/PPI-1.212.ebuild
deleted file mode 100644
index b499e2c7cf7e..000000000000
--- a/dev-perl/PPI/PPI-1.212.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-perl/PPI/PPI-1.212.ebuild,v 1.4 2012/03/25 15:38:51 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=ADAMK
-inherit perl-module
-
-DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=virtual/perl-Scalar-List-Utils-1.20
-	>=dev-perl/Params-Util-1.00
-	>=dev-perl/Clone-0.30
-	>=virtual/perl-Digest-MD5-2.35
-	dev-perl/IO-String
-	>=dev-perl/List-MoreUtils-0.16
-	>=virtual/perl-Storable-2.17"
-DEPEND="${RDEPEND}
-	test? ( >=dev-perl/File-Remove-1.42
-		>=virtual/perl-Test-Simple-0.86
-		>=dev-perl/Test-NoWarnings-0.084
-		>=virtual/perl-File-Spec-0.84
-		dev-perl/Test-SubCalls
-		dev-perl/Test-Object
-		>=dev-perl/Class-Inspector-1.22 )"
-#		>=dev-perl/Test-ClassAPI-1.04 )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index 4aa36dae95a1..07b67f42b229 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -1,4 +1 @@
-DIST Perl-Critic-1.106.tar.gz 565392 RMD160 2121b9bf64d1d19ecc0290c036fb44867b166777 SHA1 571f97eed9436cfbd4d2bfee3677844eac11f42f SHA256 5165a6aa9a5a19d1d10d7206ee1f3bf7f68d738315769beb15ed03ed50fd1ec6
-DIST Perl-Critic-1.111.tar.gz 608935 RMD160 006d4b61c177767a4aed35b9293404ed385ffc88 SHA1 f48f25b0147bc47f6966af540fab3617883368ee SHA256 a1e1987226fb81ab110cf1d2d1fef2ff698233fbc40c7517b1ee98a127c520c5
-DIST Perl-Critic-1.116.tar.gz 637400 RMD160 6b9ec8cc12d38c6c44b5476812b6195c781e60c8 SHA1 12d6c134df307e885f122114dee94eeabc071009 SHA256 04f0b80a68171341f79a9862b30132288e93c5a165985fc51b4a6e573043284e
 DIST Perl-Critic-1.117.tar.gz 645793 RMD160 63c53031d87a9c4928af79a06c49955dc55eadfc SHA1 3a67aefe7d6e4e4a13d4dd929aa92504e7215fbc SHA256 66c6ba45fdf04458a94a312d0ff0785eac74860a77a407bfe5af4dd2615e199e
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.106.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.106.ebuild
deleted file mode 100644
index 477373d84841..000000000000
--- a/dev-perl/Perl-Critic/Perl-Critic-1.106.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic/Perl-Critic-1.106.ebuild,v 1.4 2012/03/24 19:53:33 armin76 Exp $
-
-EAPI=3
-
-#inherit versionator
-MODULE_AUTHOR=ELLIOTJS
-#MY_P="${PN}-$(delete_version_separator 2)"
-inherit perl-module
-
-#S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Critique Perl source code for best-practices"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND=">=virtual/perl-Module-Pluggable-3.1
-	>=dev-perl/Config-Tiny-2
-	dev-perl/List-MoreUtils
-	dev-perl/IO-String
-	dev-perl/String-Format
-	dev-perl/perltidy
-	>=dev-perl/PPI-1.205
-	>=dev-perl/set-scalar-1.20
-	dev-perl/File-Which
-	dev-perl/B-Keywords
-	dev-perl/Readonly
-	dev-perl/Exception-Class
-	virtual/perl-version"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? ( dev-perl/Test-Deep
-		dev-perl/PadWalker
-		dev-perl/Test-Memory-Cycle
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-mydoc="extras/* examples/*"
-
-SRC_TEST="do"
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.111.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.111.ebuild
deleted file mode 100644
index c01f83c2e532..000000000000
--- a/dev-perl/Perl-Critic/Perl-Critic-1.111.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic/Perl-Critic-1.111.ebuild,v 1.4 2012/03/24 19:53:33 armin76 Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=ELLIOTJS
-MODULE_VERSION=1.111
-inherit perl-module
-
-DESCRIPTION="Critique Perl source code for best-practices"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND=">=virtual/perl-Module-Pluggable-3.1
-	>=dev-perl/Config-Tiny-2
-	>=dev-perl/Email-Address-1.88.9
-	dev-perl/List-MoreUtils
-	dev-perl/IO-String
-	dev-perl/String-Format
-	dev-perl/perltidy
-	>=dev-perl/PPI-1.208
-	dev-perl/PPIx-Utilities
-	>=dev-perl/set-scalar-1.20
-	dev-perl/File-Which
-	dev-perl/B-Keywords
-	dev-perl/Readonly
-	dev-perl/Exception-Class
-	virtual/perl-version"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? ( dev-perl/Test-Deep
-		dev-perl/PadWalker
-		dev-perl/Test-Memory-Cycle
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-mydoc="extras/* examples/*"
-
-SRC_TEST="do"
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.116.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.116.0.ebuild
deleted file mode 100644
index d830f582fdef..000000000000
--- a/dev-perl/Perl-Critic/Perl-Critic-1.116.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic/Perl-Critic-1.116.0.ebuild,v 1.4 2012/03/24 19:53:33 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=ELLIOTJS
-MODULE_VERSION=1.116
-inherit perl-module
-
-DESCRIPTION="Critique Perl source code for best-practices"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-
-RDEPEND=">=virtual/perl-Module-Pluggable-3.1
-	>=dev-perl/Config-Tiny-2
-	>=dev-perl/Email-Address-1.88.9
-	dev-perl/List-MoreUtils
-	dev-perl/IO-String
-	dev-perl/perltidy
-	>=dev-perl/PPI-1.215
-	dev-perl/PPIx-Utilities
-	>=dev-perl/PPIx-Regexp-0.19.0
-	dev-perl/Pod-Spell
-	>=dev-perl/set-scalar-1.20
-	dev-perl/File-Which
-	dev-perl/B-Keywords
-	dev-perl/Readonly
-	dev-perl/Exception-Class
-	dev-perl/String-Format
-	>=virtual/perl-version-0.77"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/PadWalker
-		dev-perl/Test-Memory-Cycle
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-mydoc="extras/* examples/*"
-
-SRC_TEST="do"
diff --git a/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild b/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild
index a0a60b91b59a..d9bab38bdb67 100644
--- a/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild
+++ b/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild,v 1.3 2011/12/18 17:43:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0.ebuild,v 1.4 2012/06/04 02:07:55 xmw Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interpret and act on wait() status values"
 
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ia64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/IPC-Signal"
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.03-r5.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.03-r5.ebuild
deleted file mode 100644
index 6fd607b477f1..000000000000
--- a/dev-perl/SGMLSpm/SGMLSpm-1.03-r5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SGMLSpm/SGMLSpm-1.03-r5.ebuild,v 1.22 2011/07/30 10:42:20 tove Exp $
-
-MY_P="${P}ii"
-DESCRIPTION="Perl library for parsing the output of nsgmls"
-HOMEPAGE="http://search.cpan.org/author/DMEGG/SGMLSpm-1.03ii/"
-SRC_URI="mirror://cpan/authors/id/D/DM/DMEGG/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.0-r12"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}"/${P}-Makefile "${S}"/Makefile
-	eval `perl '-V:package'`
-	eval `perl '-V:version'`
-	cd "${S}"
-	sed -i -e "s:5.6.1:${version}:" Makefile
-#	sed -i -e "s:perl5:perl5/vendor_perl/${version}:" Makefile
-	sed -i -e "s:MODULEDIR = \${PERL5DIR}/site_perl/${version}/SGMLS:MODULEDIR = \${PERL5DIR}/vendor_perl/${version}/SGMLS:" Makefile
-	sed -i -e "s:SPECDIR = \${PERL5DIR}:SPECDIR = ${D}/usr/share/SGMLS:" Makefile
-	sed -i -e "s:\${PERL5DIR}/SGMLS.pm:\${PERL5DIR}/vendor_perl/${version}/SGMLS.pm:" Makefile
-	sed -i -e "s/^all: .*/all:/" Makefile
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/lib/${package}/vendor_perl/${version}
-	dodir /usr/share/SGMLS
-	dodoc BUGS ChangeLog README TODO
-	make install -f "${S}"/Makefile || die
-	make docs -f "${S}"/Makefile || die
-#	cd ${D}/usr/lib/${package}/vendor_perl/${version}
-}
diff --git a/dev-perl/SGMLSpm/files/SGMLSpm-1.03-Makefile b/dev-perl/SGMLSpm/files/SGMLSpm-1.03-Makefile
deleted file mode 100644
index a9206d84cf5c..000000000000
--- a/dev-perl/SGMLSpm/files/SGMLSpm-1.03-Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-########################################################################
-# Makefile for installing SGMLS.pm and associated files in Unix
-# or Unix-like environments.  You should check the values of the
-# variables at the beginning and change them as appropriate.
-#
-# Version: 1.03ii
-########################################################################
-
-DIST = SGMLSpm-1.03ii.tar.gz
-
-#
-# Beginning of user options.
-#
-
-# Where is the binary for perl5 located on your system?
-PERL = /usr/bin/perl
-
-# Where do you want the sgmlspl executable script to be installed?
-BINDIR = ${D}/usr/bin
-
-# Where do you put local perl5 libaries?
-PERL5DIR = ${D}/usr/lib/perl5
-MODULEDIR = ${PERL5DIR}/site_perl/5.6.1/SGMLS
-
-# Where do you want to put sgmlspl specifications?
-SPECDIR = ${PERL5DIR}
-
-# If you plan to install the HTML version of the documentation, where
-# do you intend to put it?  'make html' will create two
-# subdirectories, ${HTMLDIR}/SGMLSpm and ${HTMLDIR}/sgmlspl, and place
-# its files there.
-HTMLDIR = ${D}/usr/share/doc/${P}/html
-
-
-#
-# End of user options.
-#
-
-HTML_SOURCES = DOC/HTML/SGMLSpm/ DOC/HTML/sgmlspl/
-
-FILES =	${BINDIR}/sgmlspl \
-	${PERL5DIR}/SGMLS.pm \
-	${MODULEDIR}/Output.pm \
-	${MODULEDIR}/Refs.pm \
-	${SPECDIR}/skel.pl
-
-all: install docs
-
-install: install_system # install_html
-
-install_system: ${MODULEDIR} ${FILES}
-
-dist: ${DIST}
-
-${BINDIR}/sgmlspl: sgmlspl.pl
-	sed -e 's!/usr/bin/perl!${PERL}!' sgmlspl.pl > ${BINDIR}/sgmlspl
-	chmod a+x,a+r ${BINDIR}/sgmlspl
-
-${PERL5DIR}/SGMLS.pm: SGMLS.pm
-	cp SGMLS.pm ${PERL5DIR}/SGMLS.pm
-	chmod a+r ${PERL5DIR}/SGMLS.pm
-
-${MODULEDIR}:
-	if [ ! -d ${MODULEDIR} ]; then\
-	  mkdir ${MODULEDIR}; \
-	  chmod a+x ${MODULEDIR}; \
-	fi
-
-${MODULEDIR}/Output.pm: Output.pm
-	cp Output.pm ${MODULEDIR}/Output.pm
-	chmod a+r ${MODULEDIR}/Output.pm
-
-${MODULEDIR}/Refs.pm: Refs.pm
-	cp Refs.pm ${MODULEDIR}/Refs.pm
-	chmod a+r ${MODULEDIR}/Refs.pm
-
-${SPECDIR}/skel.pl: skel.pl
-	cp skel.pl ${SPECDIR}/skel.pl
-	chmod a+r ${SPECDIR}/skel.pl
-
-install_html: ${HTML_SOURCES}
-	cd DOC; make html
-	rm -rf ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
-	cp -r ${HTML_SOURCES} ${HTMLDIR}
-	chmod a+x,a+r ${HTMLDIR}/SGMLSpm ${HTMLDIR}/sgmlspl
-	chmod a+r ${HTMLDIR}/SGMLSpm/* ${HTMLDIR}/sgmlspl/*
-
-docs:
-	cd DOC; make all
-
-${DIST}: clean docs
-	cd ..; \
-	tar -c -v -z --exclude RCS -f /tmp/${DIST} SGMLSpm; \
-	mv /tmp/${DIST} SGMLSpm
-
-clean:
-	cd DOC; make clean
-	rm -f *~ core *.tar *.tar.gz
diff --git a/dev-perl/Statistics-Descriptive/Manifest b/dev-perl/Statistics-Descriptive/Manifest
index bce57a9d9501..97e9f7606300 100644
--- a/dev-perl/Statistics-Descriptive/Manifest
+++ b/dev-perl/Statistics-Descriptive/Manifest
@@ -1,7 +1,2 @@
-DIST Statistics-Descriptive-3.0100.tar.gz 22002 RMD160 9a566c2e8c5d27cb646ca290f60f20744929ca03 SHA1 d7e4ac871e7d92454bc515af0857d48e079377e7 SHA256 ca6df4586c327784fcc4de11e88b28ac2de03cfb3b1d4ca9044089462bb5febd
-DIST Statistics-Descriptive-3.0300.tar.gz 24927 RMD160 caf5921b145551649b0fd09f78195f99776180eb SHA1 7dc4fa45eae3c57ef3427cda2eace40352fd3d74 SHA256 b1c0a33471bf641b51b760badcf8dfcf19b774711aaa9af524333b93720abc89
 DIST Statistics-Descriptive-3.0400.tar.gz 25226 RMD160 ff3b8dd2529f08e71fce3fd215a487e11fea0e16 SHA1 a94d44d58cd5172d2393f7af753d460f400ec712 SHA256 bae84519f6924527e6931fc4eb97f3db151ed19f7927b7b2e07df515f0aee383
-DIST Statistics-Descriptive-3.0500.tar.gz 27208 RMD160 0e1165fcd308d5b641c8fac920645eaa4340d8f4 SHA1 263b136e74767ec2b534c573bf0ba0a440ebf6c0 SHA256 146f512469e2e76e13363da466e5fe865cc5fd9cbc6a349e2e12a9f1d560e73c
-DIST Statistics-Descriptive-3.0601.tar.gz 33670 RMD160 d0f5b810847f1fab8261b703678e181bb1cba815 SHA1 fb0ae314fe82ac25a3b31d62554fc3f1f9d96298 SHA256 583fe85de1a1bdd5e3b32d661ad6a2b425f5823ab3a84000ebedef0b50197f95
-DIST Statistics-Descriptive-3.0602.tar.gz 33705 RMD160 e733bfda165b22df4f12b2c994255d94e7b4d6c6 SHA1 542abb715fb9ec912d22fecca9188ebe2bec093f SHA256 b0338b0f54423c693c1acef8640fd5cad7d2886269369f62439dc09f1ef0226a
 DIST Statistics-Descriptive-3.0603.tar.gz 34511 RMD160 93ba2c8efb2a35d5ea1c5b6c9ad5be3ec607c92e SHA1 77be6de733116ad6586f8031b1c28846a691a981 SHA256 2432f3131d4f4000586b2d2d58c2fe914c979efbcc3357bc57e8f0360c2e9387
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.0100.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.0100.ebuild
deleted file mode 100644
index bf4b70c12cca..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.0100.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.0100.ebuild,v 1.6 2012/05/28 15:50:04 armin76 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=SHLOMIF
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-
-DEPEND="virtual/perl-Module-Build
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-RDEPEND=""
-
-SRC_TEST="do"
-mydoc="UserSurvey.txt"
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.30.0.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.30.0.ebuild
deleted file mode 100644
index d2dd19ae5606..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.30.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-perl/Statistics-Descriptive/Statistics-Descriptive-3.30.0.ebuild,v 1.2 2012/05/28 15:50:04 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=3.0300
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
-mydoc="UserSurvey.txt"
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.50.0.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.50.0.ebuild
deleted file mode 100644
index 4131354d1d9f..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.50.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-perl/Statistics-Descriptive/Statistics-Descriptive-3.50.0.ebuild,v 1.2 2012/05/28 15:50:04 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=3.0500
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
-mydoc="UserSurvey.txt"
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.100.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.100.ebuild
deleted file mode 100644
index 4b3a370b62fb..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.100.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-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.100.ebuild,v 1.2 2012/05/28 15:50:04 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=3.0601
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
-mydoc="UserSurvey.txt"
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.200.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.200.ebuild
deleted file mode 100644
index d889b9d39535..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.200.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-perl/Statistics-Descriptive/Statistics-Descriptive-3.60.200.ebuild,v 1.2 2012/05/28 15:50:04 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=3.0602
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="virtual/perl-Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
-mydoc="UserSurvey.txt"
diff --git a/dev-perl/Test-Fatal/Manifest b/dev-perl/Test-Fatal/Manifest
index 61c7c65a2c65..d749fa4861f7 100644
--- a/dev-perl/Test-Fatal/Manifest
+++ b/dev-perl/Test-Fatal/Manifest
@@ -1,5 +1 @@
-DIST Test-Fatal-0.003.tar.gz 11256 RMD160 da1c5b37c17e35850760209bca5130bf597ef745 SHA1 3c6f9ddab060561f4173d43457a619a769234e70 SHA256 2725dbddf64a1c6f3a5bf29dc15d167d881716ec35b2abd6e05c05b537f65184
-DIST Test-Fatal-0.006.tar.gz 12616 RMD160 c1becd70ecb24e7da435a2e944b52b5c3cd365b4 SHA1 52b6c449e8c783cf0457cca49acdddd82e33c1e1 SHA256 bdc9906343bc2287a80ee646060ef4850c9b2dbbc78efd63ce00735ce1fd5d51
-DIST Test-Fatal-0.008.tar.gz 12866 RMD160 e1f2289b1d5528725aedf918bd9b81e4ed520952 SHA1 d2756e4c1b57333107895bcdb8c3957be4abaeb4 SHA256 5cca61b381567c325c3d958bd3de582a8bf47c23798106dccd467c770ce16a3f
-DIST Test-Fatal-0.009.tar.gz 13023 RMD160 daf13f28859a913e096d9d11f92f12ad0f3b06a0 SHA1 1aedf094bff0b5212e522d82eee67bdf2eccfbd3 SHA256 6d37f463829487a467181a0951388206c48b6f17f0a1221e3b68dc31df9c74fb
 DIST Test-Fatal-0.010.tar.gz 13075 RMD160 156a047157fcc8d1c1a614e66de5387e92ffcef0 SHA1 0814e1dc9bc81d0f909ec2610fb97ffad7b8a868 SHA256 805e8497a06c1ba5ab2cc85dea74533edbf48c738c8ecf42f6d812993d279305
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.003.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.003.ebuild
deleted file mode 100644
index 462ab426c3ae..000000000000
--- a/dev-perl/Test-Fatal/Test-Fatal-0.003.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.003.ebuild,v 1.10 2011/08/13 09:09:09 xarthisius Exp $
-
-EAPI=3
-
-MODULE_AUTHOR="RJBS"
-inherit perl-module
-
-DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Try-Tiny-0.07"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31
-	test? ( >=virtual/perl-Test-Simple-0.96 )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild
index f3509604ab35..8734fa99b487 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild,v 1.4 2012/05/05 22:04:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.10.0.ebuild,v 1.5 2012/06/03 17:32:05 tove Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Try-Tiny-0.70.0"
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.6.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.6.0.ebuild
deleted file mode 100644
index 0d514905e865..000000000000
--- a/dev-perl/Test-Fatal/Test-Fatal-0.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.6.0.ebuild,v 1.3 2011/07/07 23:04:24 aballier Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.006
-inherit perl-module
-
-DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Try-Tiny-0.70.0"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.30
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.8.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.8.0.ebuild
deleted file mode 100644
index 1816836bfb9c..000000000000
--- a/dev-perl/Test-Fatal/Test-Fatal-0.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.8.0.ebuild,v 1.1 2011/11/12 08:03:49 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.008
-inherit perl-module
-
-DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Try-Tiny-0.70.0"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.30
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.9.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.9.0.ebuild
deleted file mode 100644
index 8c30a44d86a4..000000000000
--- a/dev-perl/Test-Fatal/Test-Fatal-0.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Fatal/Test-Fatal-0.9.0.ebuild,v 1.2 2012/03/24 12:52:57 grobian Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.009
-inherit perl-module
-
-DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Try-Tiny-0.70.0"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.30
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
diff --git a/dev-perl/WWW-Mechanize/Manifest b/dev-perl/WWW-Mechanize/Manifest
index fe375fefec3b..5d9c3162beab 100644
--- a/dev-perl/WWW-Mechanize/Manifest
+++ b/dev-perl/WWW-Mechanize/Manifest
@@ -1,4 +1 @@
-DIST WWW-Mechanize-1.66.tar.gz 122455 RMD160 8bafcf32f45bf726174426b29336e66754f16f39 SHA1 1c61a0320c0ffce214c37389bd3d828456841523 SHA256 f20912c5792620495606921b546143b395609defccc9d6e87951325c45f37588
-DIST WWW-Mechanize-1.70.tar.gz 124948 RMD160 ab1bb0d1594abfd119199eb051224afa4c97a918 SHA1 1f1b63ebd642944010f683e5fb7722fd48f71f64 SHA256 4dcc98a474fa7c4fe73099671487b3d8ecfb9828be34a80ef1638933d3d19090
-DIST WWW-Mechanize-1.71.tar.gz 125429 RMD160 d4dea28d03934aa190f9bf209daf046c908baff5 SHA1 d60fef060cadfc9eb3e61589531871d5a1f732f6 SHA256 12635501e402a4a731aa50d305d43d253a34be10c25ac091df8c3ee79329e435
 DIST WWW-Mechanize-1.72.tar.gz 125483 RMD160 0cc9583f54a73cc1f997c561add40225872bfb12 SHA1 2c6d84b78fb145075ff2b9b1120344995090575b SHA256 a69a77ede6538ca35170b1864f52edba8f47cfa8d57925b95ee598938cb8436f
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild
deleted file mode 100644
index 137348ea7f8d..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild,v 1.8 2012/03/25 15:34:44 armin76 Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-# Bug in the tests - improper use of HTTP::Server
-SRC_TEST="do"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	|| (
-		( >dev-perl/libwww-perl-6 dev-perl/HTML-Form )
-		<dev-perl/libwww-perl-6
-	)
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/Test-LongString"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/PadWalker
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Exception
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle )"
-#		dev-perl/HTTP-Server-Simple )"
-
-# Remove test until the bug is fixed:
-# http://rt.cpan.org/Public/Bug/Display.html?id=41673
-src_prepare() {
-	mv "${S}"/t/cookies.t{,.disable} || die
-	sed -i "/cookies.t/d" "${S}/MANIFEST" || die
-	perl-module_src_prepare
-}
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.700.0.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.700.0.ebuild
deleted file mode 100644
index 1466924ff0ed..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.700.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.700.0.ebuild,v 1.2 2012/03/25 15:34:44 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=JESSE
-MODULE_VERSION=1.70
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	|| (
-		( >dev-perl/libwww-perl-6 dev-perl/HTML-Form )
-		<dev-perl/libwww-perl-6
-	)
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/Test-LongString"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/PadWalker
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Exception
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle
-		dev-perl/HTTP-Server-Simple
-	)"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.710.0.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.710.0.ebuild
deleted file mode 100644
index c8a400fe1e23..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.710.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.710.0.ebuild,v 1.2 2012/03/25 15:34:44 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=JESSE
-MODULE_VERSION=1.71
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/IO-Socket-SSL
-	|| (
-		( >dev-perl/libwww-perl-6 dev-perl/HTML-Form )
-		<dev-perl/libwww-perl-6
-	)
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/HTML-Tree
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/PadWalker
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Exception
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle
-		dev-perl/HTTP-Server-Simple
-	)
-"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
-
-SRC_TEST=do
diff --git a/dev-perl/XML-Parser/Manifest b/dev-perl/XML-Parser/Manifest
index c17bf4d79809..698c35017182 100644
--- a/dev-perl/XML-Parser/Manifest
+++ b/dev-perl/XML-Parser/Manifest
@@ -1,2 +1 @@
-DIST XML-Parser-2.36.tar.gz 230002 RMD160 1c31a2398ada943efd5d2451389e163914168253 SHA1 74acac4f939ebf788d8ef5163cbc9802b1b04bfa SHA256 9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
 DIST XML-Parser-2.41.tar.gz 238441 RMD160 61252e5f33b205246f51c668180311e6cbd60111 SHA1 68c7ee61b413c2e8255699b1987fca598e0a39d8 SHA256 b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9
diff --git a/dev-perl/XML-Parser/XML-Parser-2.36-r1.ebuild b/dev-perl/XML-Parser/XML-Parser-2.36-r1.ebuild
deleted file mode 100644
index b47eece2d7b2..000000000000
--- a/dev-perl/XML-Parser/XML-Parser-2.36-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Parser/XML-Parser-2.36-r1.ebuild,v 1.9 2011/07/30 10:46:52 tove Exp $
-
-MODULE_AUTHOR=MSERGEANT
-inherit perl-module multilib
-
-DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/expat-1.95.1-r1
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:^\$expat_libpath.*:\$expat_libpath = '${EPREFIX}/usr/$(get_libdir)';:" \
-		Makefile.PL || die "sed failed"
-}
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 7962660d07ba..f43292b81a74 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,8 +1,2 @@
-DIST Glib-1.223.tar.gz 267173 RMD160 62b06b7a45f1be9ebd03efeedb2462e16b4248b6 SHA1 db8268dc52b4c10038db24604886c54cae142ac7 SHA256 250fc7b888ddf96bf5ace9fd738108acb256209d4b8678532c4ed7262e915ae7
-DIST Glib-1.224.tar.gz 270713 RMD160 60c27d7c604768aaf8b3a48566022258e0d7a160 SHA1 3c6e3be47d62df4fc1557c82029e679fe538de75 SHA256 a536f536b288f7ee30b6d4c3156febcf37d4f1da903ef34a96ee6cf3babf0017
-DIST Glib-1.240.tar.gz 278781 RMD160 df96c047f58c32cb7dd5eae4c9b2912f0f4e4724 SHA1 c0e87130b62cff90496e965317fed4fa9a47dbde SHA256 f47b3a6821133df3303c09057a2747df1fcfb022dc1cff007a9a8435a3ff5611
-DIST Glib-1.241.tar.gz 275706 RMD160 52290d009fc7a29ed4e7fe55eee61295c1ed3072 SHA1 465eddbb80f2221a5089575e0f98058d81e42638 SHA256 b5a3a52d6c030af9754f13c7752bdba6dbdb752107543e24909854382afc22ec
 DIST Glib-1.242.tar.gz 275868 RMD160 c8d5e09b39b02b3df362e8ad26485c2eb09782cf SHA1 5662e92eff16e3ba1980081e87b4ecdef88593f1 SHA256 0ebb78bcb3d10c9564473b084ef2989cf86347c1ba4acd5e55bc6c46b6d08d78
-DIST Glib-1.250.tar.gz 276583 RMD160 66251cbee9cda56ae76de71b33242c0e29b5955f SHA1 6ea9349440743b925efce059e8c45ba351fe6bcc SHA256 383a6ea6343944fa969fbb2eccff3a6d021c9344ee5669ae94ea265201b4bfc6
-DIST Glib-1.251.tar.gz 278428 RMD160 33841205653ee6c346cd72d21be4bbdb078219df SHA1 60f30450480145b46e80298baf7c965f28797a3a SHA256 abbf8d283619fc07d8e86bc90396ea997ecc2652296f5e0e67d116c87e00e534
 DIST Glib-1.260.tar.gz 278587 RMD160 b205d7321978098b6a8d9383128441abd2662f68 SHA1 6d93f603ea7b7054502c46df8e138e89fb067b0e SHA256 db01e042278b6cd64a0be7bbb5b2432da236ec4f4bfb472d3ab5b2fe07c105a3
diff --git a/dev-perl/glib-perl/glib-perl-1.223.ebuild b/dev-perl/glib-perl/glib-perl-1.223.ebuild
deleted file mode 100644
index 04cd1fdcd680..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.223.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.223.ebuild,v 1.9 2012/05/04 04:10:55 jdhore Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=TSCH
-MY_PN=Glib
-MY_P=${MY_PN}-${PV}
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-S=${WORKDIR}/${MY_P}
-
-SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.224.0.ebuild b/dev-perl/glib-perl/glib-perl-1.224.0.ebuild
deleted file mode 100644
index c8ba3261ceb2..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.224.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.224.0.ebuild,v 1.2 2012/05/04 04:10:55 jdhore Exp $
-
-EAPI=4
-
-MY_PN=Glib
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=1.224
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.240.0.ebuild b/dev-perl/glib-perl/glib-perl-1.240.0.ebuild
deleted file mode 100644
index 6cefcd2e2eb8..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.240.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.240.0.ebuild,v 1.2 2012/05/04 04:10:55 jdhore Exp $
-
-EAPI=4
-
-MY_PN=Glib
-MODULE_AUTHOR=TSCH
-MODULE_VERSION=1.240
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.241.0.ebuild b/dev-perl/glib-perl/glib-perl-1.241.0.ebuild
deleted file mode 100644
index e35902c681b7..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.241.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.241.0.ebuild,v 1.2 2012/05/04 04:10:55 jdhore Exp $
-
-EAPI=4
-
-MY_PN=Glib
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.241
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.250.0.ebuild b/dev-perl/glib-perl/glib-perl-1.250.0.ebuild
deleted file mode 100644
index 1bcbc77315cb..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.250.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.250.0.ebuild,v 1.2 2012/05/04 04:10:55 jdhore Exp $
-
-EAPI=4
-
-MY_PN=Glib
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.250
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-SRC_TEST="do"
diff --git a/dev-perl/glib-perl/glib-perl-1.251.0.ebuild b/dev-perl/glib-perl/glib-perl-1.251.0.ebuild
deleted file mode 100644
index c17d1908a706..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.251.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.251.0.ebuild,v 1.4 2012/05/16 13:36:34 aballier Exp $
-
-EAPI=4
-
-MY_PN=Glib
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.251
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-perl/extutils-pkgconfig-1.0
-	>=dev-perl/extutils-depends-0.300"
-
-SRC_TEST="do"
diff --git a/dev-perl/libintl-perl/Manifest b/dev-perl/libintl-perl/Manifest
index aca9af34311b..270eaf159c40 100644
--- a/dev-perl/libintl-perl/Manifest
+++ b/dev-perl/libintl-perl/Manifest
@@ -1,2 +1 @@
-DIST libintl-perl-1.16.tar.gz 465597 RMD160 b72df501fd6744cc78d762f0d7b274211c807d9c SHA1 7a496e50ea3c6674202e556c1a7d9f1fc3357eb5 SHA256 1a64895c9a6cdbb5cdfff81f1520541fee28e85fb940d9b0484de656d69ae8f5
 DIST libintl-perl-1.20.tar.gz 499899 RMD160 dc130355f284205aaa3049039de5de712b3f5f25 SHA1 883237efa86c617550f1b0bed1adea2885213ce5 SHA256 3036a9d2df85f200631b55a0b01082898c20819d9aabdb9b871508054bee5c67
diff --git a/dev-perl/libintl-perl/libintl-perl-1.16.ebuild b/dev-perl/libintl-perl/libintl-perl-1.16.ebuild
deleted file mode 100644
index e264db3edb9a..000000000000
--- a/dev-perl/libintl-perl/libintl-perl-1.16.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libintl-perl/libintl-perl-1.16.ebuild,v 1.10 2007/07/10 23:33:26 mr_bones_ Exp $
-
-inherit perl-module
-
-DESCRIPTION="Perl internationalization library that aims to be compatible with the Uniforum message translations system"
-HOMEPAGE="http://search.cpan.org/~guido/"
-SRC_URI="mirror://cpan/authors/id/G/GU/GUIDO/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/mime-construct/mime-construct-1.900.0.ebuild b/dev-perl/mime-construct/mime-construct-1.900.0.ebuild
index 0eb5ed27f140..3ab9d421ecc8 100644
--- a/dev-perl/mime-construct/mime-construct-1.900.0.ebuild
+++ b/dev-perl/mime-construct/mime-construct-1.900.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mime-construct/mime-construct-1.900.0.ebuild,v 1.3 2011/12/18 17:46:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mime-construct/mime-construct-1.900.0.ebuild,v 1.4 2012/06/04 02:13:12 xmw Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="construct and optionally mail MIME messages"
 
 LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ia64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/MIME-Types
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
index fa6a57533493..14f8866d0698 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild,v 1.3 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild,v 1.4 2012/06/03 16:31:19 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
 MY_PN=mogilefs-server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild
index 69cd53e9854a..4fb4b7928d93 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.43.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
@@ -8,7 +8,7 @@ MY_PN=MogileFS-Server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild
index 138ec374b0d4..d8c107fe6537 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild,v 1.3 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.46.ebuild,v 1.4 2012/06/03 16:31:19 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
@@ -8,7 +8,7 @@ MY_PN=MogileFS-Server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild
index 3431903f2025..a45d17589840 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.50.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
@@ -8,7 +8,7 @@ MY_PN=MogileFS-Server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild
index 0bc55559ee5e..848962a8636a 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.51.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
@@ -8,7 +8,7 @@ MY_PN=MogileFS-Server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild
index 7723c96598d7..3a39164a3896 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.53.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
@@ -8,7 +8,7 @@ MY_PN=MogileFS-Server
 MY_P="${MY_PN}-${PV}"
 MODULE_A="${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild
index 7ef66ed929a8..caa41a2651a4 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.530.0.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=2.53
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild
index e60b0e11a008..d20bfe5938e0 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.540.0.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=2.54
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild
index dc11c1df257e..4c9b3296f92d 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild,v 1.2 2011/12/16 19:53:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.550.0.ebuild,v 1.3 2012/06/03 16:31:18 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV:0:4}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild
index aafc95ddbc06..042065198a3b 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild,v 1.1 2012/01/28 05:09:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.560.0.ebuild,v 1.2 2012/06/03 16:31:19 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV:0:4}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild
index 93c99337a06e..9dcd3b84520f 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild,v 1.1 2012/02/01 18:11:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.570.0.ebuild,v 1.2 2012/06/03 16:31:19 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV:0:4}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild
index 799a52e01797..d1587fee484d 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild,v 1.1 2012/02/29 08:17:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.580.0.ebuild,v 1.2 2012/06/03 16:31:18 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV:0:4}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild
index 9732650f7884..b1eeafb694c2 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild,v 1.1 2012/03/01 08:06:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild,v 1.2 2012/06/03 16:31:18 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV:0:4}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild
index 2034f9569db8..fd1783d7f5f3 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild,v 1.2 2012/04/21 02:29:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.600.0.ebuild,v 1.3 2012/06/03 16:31:19 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV%0.0}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild
index 19e29775dbfd..25393f6c531e 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild,v 1.1 2012/05/19 18:36:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.610.0.ebuild,v 1.2 2012/06/03 16:31:19 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV%0.0}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild
index 6008ea9c2c09..f75ee8e5650a 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild,v 1.1 2012/05/20 04:11:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.620.0.ebuild,v 1.2 2012/06/03 16:31:18 tove Exp $
 
 EAPI=4
 
 MY_PN=MogileFS-Server
 MODULE_AUTHOR=DORMANDO
 MODULE_VERSION=${PV%0.0}
-inherit perl-module
+inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
 HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
diff --git a/dev-perl/regexp-common/Manifest b/dev-perl/regexp-common/Manifest
index 036abb03bb06..a8b33cbb4f02 100644
--- a/dev-perl/regexp-common/Manifest
+++ b/dev-perl/regexp-common/Manifest
@@ -1,3 +1 @@
-DIST Regexp-Common-2010010201.tar.gz 112749 RMD160 a1ba8e0e0e87192cf67a8c5d4c7a9ab79786cdd8 SHA1 259a836195ffc93d98f5b0d6ccc35993b88fd860 SHA256 a4c348d2b7a045ac5468a93e09a3c622abcee6dfb785ecf04ac859b73ba0115b
-DIST Regexp-Common-2011041701.tar.gz 113141 RMD160 b4dcff93304f52c9754c94d5be6317566ad0daa4 SHA1 4ec90a713def15d4aba6aefbd529751c77f532f0 SHA256 dcbffd71c6bbdd5187a9241838e0a1b87aa34bd111c9d6714e9aaeca1f35d714
 DIST Regexp-Common-2011121001.tar.gz 114141 RMD160 edfb7d6b8e8c3e4d67ed1cfe62499dac37464ccc SHA1 9fba14d863212bf0b251e0b3de87fb0ce5e6775b SHA256 0bf9c2f40c64c05889f7bc16922bb01ca737410180949e088d6974e739e06b39
diff --git a/dev-perl/regexp-common/regexp-common-2010010201.ebuild b/dev-perl/regexp-common/regexp-common-2010010201.ebuild
deleted file mode 100644
index 9d9838f74c97..000000000000
--- a/dev-perl/regexp-common/regexp-common-2010010201.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/regexp-common/regexp-common-2010010201.ebuild,v 1.7 2010/09/13 13:13:13 josejx Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=ABIGAIL
-MY_PN=Regexp-Common
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-inherit perl-module
-
-DESCRIPTION="Provide commonly requested regular expressions"
-
-LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/regexp-common/regexp-common-2011041701.0.0.ebuild b/dev-perl/regexp-common/regexp-common-2011041701.0.0.ebuild
deleted file mode 100644
index e1b4e12b4790..000000000000
--- a/dev-perl/regexp-common/regexp-common-2011041701.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/regexp-common/regexp-common-2011041701.0.0.ebuild,v 1.1 2011/04/19 17:12:25 tove Exp $
-
-EAPI=4
-
-MY_PN=Regexp-Common
-MODULE_AUTHOR=ABIGAIL
-MODULE_VERSION=2011041701
-inherit perl-module
-
-DESCRIPTION="Provide commonly requested regular expressions"
-
-LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-python/numpy/numpy-1.6.1-r1.ebuild b/dev-python/numpy/numpy-1.6.1-r1.ebuild
index 87626b49dd0a..b2e3886198f6 100644
--- a/dev-python/numpy/numpy-1.6.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.7 2012/06/02 13:43:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.8 2012/06/03 18:29:54 maekke Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/oauthlib-0.1.3.ebuild b/dev-python/oauthlib/oauthlib-0.1.3.ebuild
index 662e48d82f45..ac80b5caf8d5 100644
--- a/dev-python/oauthlib/oauthlib-0.1.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.1.3.ebuild,v 1.5 2012/05/28 17:56:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.1.3.ebuild,v 1.6 2012/06/03 16:25:18 marienz Exp $
 
 EAPI="4"
 
@@ -8,6 +8,8 @@ PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 3.*"
 DISTUTILS_SRC_TEST="nosetests"
+# Tests depend on dict order, see https://github.com/idangazit/oauthlib/issues/40
+PYTHON_TESTS_RESTRICTED_ABIS="*-pypy-*"
 
 inherit distutils
 
diff --git a/dev-python/pycrypto/pycrypto-2.6.ebuild b/dev-python/pycrypto/pycrypto-2.6.ebuild
index e13c69da5f0d..d98dd182b86f 100644
--- a/dev-python/pycrypto/pycrypto-2.6.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.6 2012/05/30 19:12:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.7 2012/06/03 18:04:23 armin76 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp )"
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 6c8517246d2f..81eaac922968 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
-	<maintainer>
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<use>
 		<flag name="X">Build QtGui, QtDesigner, QtTest and QtUiTools modules</flag>
 		<flag name="declarative">Build QtDeclarative module</flag>
diff --git a/dev-python/pyside/pyside-1.1.1.ebuild b/dev-python/pyside/pyside-1.1.1.ebuild
index 1f6f533ac127..92e65017d6c2 100644
--- a/dev-python/pyside/pyside-1.1.1.ebuild
+++ b/dev-python/pyside/pyside-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v 1.4 2012/06/02 23:08:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v 1.5 2012/06/03 16:14:23 pesa Exp $
 
 EAPI=4
 
@@ -73,6 +73,7 @@ src_prepare() {
 	# library suffixed with the correct python version.
 	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
 		libpyside/pyside.pc.in || die
+
 	if use prefix; then
 		cp "${FILESDIR}"/rpath.cmake .
 		sed \
@@ -118,7 +119,9 @@ src_test() {
 	testing() {
 		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" virtualmake
 	}
+	python_enable_pyc
 	python_execute_function testing
+	python_disable_pyc
 }
 
 src_install() {
diff --git a/dev-python/pytz/pytz-2012c.ebuild b/dev-python/pytz/pytz-2012c.ebuild
index 5335e40aa03d..a1b8f47ab20e 100644
--- a/dev-python/pytz/pytz-2012c.ebuild
+++ b/dev-python/pytz/pytz-2012c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012c.ebuild,v 1.5 2012/05/29 19:48:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012c.ebuild,v 1.6 2012/06/03 18:15:06 maekke Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index c777bb7478c4..70f04f570490 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -2,3 +2,4 @@ DIST kramdown-0.13.3.gem 203776 RMD160 7cb174db44a69b803e0655c25a74e202fb3d598e
 DIST kramdown-0.13.4.gem 206336 RMD160 d7f984af732710503581c8b9a1d2759194347d28 SHA1 514eda95f88d485fa81c1ca7e8d34feed96e065c SHA256 a3fde6aded0a8f1d8a6bd72cadd09ab74ac6f99739efc6d78d5b9701f99656d5
 DIST kramdown-0.13.5.gem 267776 RMD160 9b69c319f7202d59bcd69f7c6c80856432b078b0 SHA1 96f31fc52ab9b929034b8e16f107dd4387382ca5 SHA256 c63619a2c203ba9f94eac36255c38a275a7cabc6146088cc644c880eaa626e36
 DIST kramdown-0.13.6.gem 267776 RMD160 baf0526c5db4a78c02eb95ed6b5fa798a87e1ee8 SHA1 125c2cc702189c46c4c69347a64e5b95383aa968 SHA256 5359918284ec61bdcfe481c02e78d0c188ddda9b7ffef4cf9829be3a029151ce
+DIST kramdown-0.13.7.gem 270336 RMD160 ec1f18c4ebf82a1d2395999f8daed7f6a2990169 SHA1 1650869b45b45dd55842b2872e64d3c165d53001 SHA256 000f55cb1ddd6d8208eb7ca9fba7d5a7da0acf3cdee2b1cf1d0b412bb7576e60
diff --git a/dev-ruby/kramdown/kramdown-0.13.7.ebuild b/dev-ruby/kramdown/kramdown-0.13.7.ebuild
new file mode 100644
index 000000000000..70a95d68fb27
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-0.13.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/kramdown/kramdown-0.13.7.ebuild,v 1.1 2012/06/04 00:49:02 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RAKE_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition."
+HOMEPAGE="http://kramdown.rubyforge.org/"
+
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex"
+
+RDEPEND+="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/coderay-1.0.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc-2 -o htmldoc/rdoc --main README --title kramdown lib README || die "Unable to generate documentation"
+	fi
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild
index add70882fc50..d5cb7238bdf4 100644
--- a/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild
+++ b/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild,v 1.1 2012/04/25 04:18:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect-lite/expect-lite-4.3.0.ebuild,v 1.2 2012/06/03 19:32:48 ago Exp $
 
 DESCRIPTION="quick and easy command line automation tool built on top of expect"
 HOMEPAGE="http://expect-lite.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug examples"
 
 RDEPEND="dev-tcltk/expect
diff --git a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
index 9e652de47d5b..b19de0435d6b 100644
--- a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.48.0-r1.ebuild,v 1.4 2012/05/23 20:36:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.48.0-r1.ebuild,v 1.5 2012/06/03 18:06:26 maekke Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples python"
 
 DEPEND="!<dev-libs/boost-1.34.0
diff --git a/dev-util/ccache/ccache-3.1.7.ebuild b/dev-util/ccache/ccache-3.1.7.ebuild
index c074e0177028..b8ca5b246d10 100644
--- a/dev-util/ccache/ccache-3.1.7.ebuild
+++ b/dev-util/ccache/ccache-3.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.7.ebuild,v 1.3 2012/06/02 23:12:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.7.ebuild,v 1.4 2012/06/03 18:40:07 maekke Exp $
 
 inherit multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index d8a47ebfc038..f79c9302982a 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,40 +1,20 @@
-DIST eric4-4.5.0.tar.gz 7986864 RMD160 b3eff69618bbb5ab4f10bbfbca3c2f9599c47026 SHA1 4b9112ce55741de60929a7e6defc2b8d717af761 SHA256 213a415fe56e9e2e0dfa12c190b6c2ae26d4a949f8ef0062edcf58f97a4775d3
 DIST eric4-4.5.3.tar.gz 8095323 RMD160 a0b83659e8ee80ef7fc799b878335d36ee425fb6 SHA1 edb447adb880645208a19a186216d5159f167a05 SHA256 211a5f41f66b28e9d68f0ab2442a6c07e29e550821f04dd5f78c2407297d1d86
-DIST eric4-i18n-cs-4.5.0.tar.gz 456601 RMD160 13ec241835e50e0c6910ad16ab76c2093e5a7c90 SHA1 ddf207c622e0c9730601ccb1d596d37cdca39ab7 SHA256 e5755882e9d580ef90bb5020c6adad983a52861e8711c2c06fe572a43a3e77fb
 DIST eric4-i18n-cs-4.5.3.tar.gz 457069 RMD160 caa92ce90b39925334f395003678d3e10c3a56da SHA1 2b44ff4e89e38596a1c98084b0721284ebcc9b68 SHA256 e702946149856ef58f30ba0d11e4a5020703ef81c98a002d36c2460297bae5e6
-DIST eric4-i18n-de-4.5.0.tar.gz 468372 RMD160 084dec0bdfa4ba950a10a22b643e5e4596145bf7 SHA1 e1daac3c9972c8d9c1b428232206c39bf10b9a77 SHA256 67e44e8435992731a9154a4aec8f641f84c4c067b14282e2f4fb7a44595d0764
 DIST eric4-i18n-de-4.5.3.tar.gz 469432 RMD160 40aaea56d6cf746da8f6242b8d38efb5e979e9b6 SHA1 64e71afd91a8c81296687e4cbb00577d9cf2aa88 SHA256 4b76cfcfe76ff6f4bd99fb6fba5265d7a517264262b5698e9fb9225b6262d853
-DIST eric4-i18n-en-4.5.0.tar.gz 126444 RMD160 88bbe0731cc39ba2d8cf3db030d8a1cad5a8cf6b SHA1 35a289b76b6fcd687161499becfe12881e8a0023 SHA256 345cbbc3212f6ebe5d37bb5d339b4a85ec45046d7beb8b1359e0a22807f9be44
 DIST eric4-i18n-en-4.5.3.tar.gz 126743 RMD160 7cfdcb91fee464ee63e64192bb812ca9e5b61c0a SHA1 96368dc99874209372674421174e479a4ed67cd7 SHA256 dc15d9f8bda50d7ce6bfbb6f9dc8c0cb915581089e674e12d9e36ce22286f0cb
-DIST eric4-i18n-es-4.5.0.tar.gz 472467 RMD160 0ed63ae05f48005a19e41fe81691278b9eb158dd SHA1 a4f242af359eca8b0019980bca847626aa82cabf SHA256 c8bd970ef804007976653ab1c5369969855bea755bfebd6ac1844bc2d093a246
 DIST eric4-i18n-es-4.5.3.tar.gz 474022 RMD160 715ca413e3402505d025cf9b0afd8f8c9cea52ad SHA1 e9d8bf8d79394ab8e3f321e7e43105cdf7277755 SHA256 368e37ca55779d1ce1db8e9ba0077e8b4593ea730bd365b25259a0bd21b1a7ef
-DIST eric4-i18n-fr-4.5.0.tar.gz 471361 RMD160 6c1ed4256341c594f2392cc2e8858079cf47815a SHA1 4e226ca1c627b3279890af249c52fff79ec45624 SHA256 32b21e91e02fc776eb0fc16e01263ae538471ad0b5ed1ef3154f2898377cd69a
 DIST eric4-i18n-fr-4.5.3.tar.gz 471882 RMD160 7dfb28a142b0d53d24299d88502294bb2e0840f9 SHA1 fab4a11218edf8875667c623991f097fbe69e4c2 SHA256 5d5e10075bdf01f81a2602dd13299aa4dbd13ac48020ce0269e683832c89d356
-DIST eric4-i18n-it-4.5.0.tar.gz 461086 RMD160 e9c13d3a820dbac0adbe4d136086e38ad6cfc100 SHA1 bab7302a7942d1c2be9396b2c7b427d16c7670aa SHA256 448a9a5142d6430a0725fa7ba680e22a43f86e001ac4923d82eb4995dd2f10ef
 DIST eric4-i18n-it-4.5.3.tar.gz 461615 RMD160 58d659cb286174a0b5b41f65c277c7123dadb444 SHA1 c918f547e101b9a51a615071dab7449b58f19e02 SHA256 9d99cff9963d106ce652418440cf225f996bbbd165808663b8abcc2da239e0da
-DIST eric4-i18n-ru-4.5.0.tar.gz 478204 RMD160 2b83436aa88feeb0ce1799fc5b98c83234e176ae SHA1 962873750747e9148e9cec4164fc06b0984cd352 SHA256 c06937b19b563963cc6b3bdd99783146a4e9169bdd28c714434d181c9c7a0ab2
 DIST eric4-i18n-ru-4.5.3.tar.gz 478775 RMD160 94aaddd315541506529429432ebe343c8aa23aa4 SHA1 fb1b773f45bcd39bc11023096940fe35480a852c SHA256 d98065318ec2b643d35c414ac5f71161d35a03227be2fac28d1320a82c590da0
-DIST eric4-i18n-tr-4.5.0.tar.gz 355691 RMD160 5af83ff7518e40b8b6aca06de6f4ff6e9a4c17ba SHA1 b951044dd011b89b12323ab013484499dde09003 SHA256 3d1016833475af50f02a84031ff06727ed61c8627a89d7e167958d3fdc59eb3c
 DIST eric4-i18n-tr-4.5.3.tar.gz 356033 RMD160 a9ed13c1ebc4a1b9586e0d326471e82601d95041 SHA1 a7188761c8b2d04f7ee8380e6d53ada718263ceb SHA256 79096459e4392f326b4f11e1789c42a57cc906c3a10ecfab0ec7660ac23acdb8
-DIST eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz 388679 RMD160 abb2d6f1953dff64553f40c354c528c4afca2009 SHA1 0dd51e2e0901d0503629ea2d76241acc5adfa67d SHA256 bb3080582edf3512fe9a8eb177dc23e4f9b35e94dc351e83bcb95ad749f853d9
 DIST eric4-i18n-zh_CN.GB2312-4.5.3.tar.gz 389004 RMD160 a344f3a239812995619b1513313c598774632084 SHA1 e109e66c837fb37444d246f851e47768e67b879f SHA256 1a0bdfdfaa50b5487f2bb1694e9cea2c929ed9651612544cfde0c4bf5168f4fb
-DIST eric5-5.2.0.tar.gz 8832214 RMD160 d5e76a258b18b59a84b75f207d926589afbb6784 SHA1 65d9ca655d455de113543d425882122e82c0a923 SHA256 18fea6c012dce4326629777e8e55d8d56dab0d16497d7ed4924b7e6075838982
 DIST eric5-5.2.2.tar.gz 8835270 RMD160 b7f8d166616d7afecfc7e1c015f24f16912a0dcb SHA1 22843abf689508ea9fa6e546b60d47facb1c8fa7 SHA256 5d7a593a3501becd5231dc7c7463cbab38f9f99be4c5ae9961a8a50389979900
-DIST eric5-i18n-cs-5.2.0.tar.gz 530064 RMD160 428bae008a6fc657a080fe1331f25cb02ed480c6 SHA1 4e3ce610926a56b04cc7a4301f60b8157e0fb96c SHA256 44979acf362742af87bbf572f00b15eb031a3f8378b616cdb4b276e084843f66
 DIST eric5-i18n-cs-5.2.2.tar.gz 530091 RMD160 b23ecc5fa261e13ab9b7859ba482bc90a8dcf257 SHA1 bbb6ecea9eb228361d4ece428e9ccbfac410e62f SHA256 8afa8705a97716b8abc308b907cfb6eaf6faa527250a87743deb7c8f8da6f24a
-DIST eric5-i18n-de-5.2.0.tar.gz 600706 RMD160 ca5e372868e33a7c87e8a05fcd66f81a45077d71 SHA1 f5e7111bfe8e3ffbe69a1fbb56253eee145f4f6b SHA256 e877139f2440506a1884007e820b8592f37ae3136727258ae352af706083e19b
 DIST eric5-i18n-de-5.2.2.tar.gz 600801 RMD160 0bf8567ca5c8ba8ce5e5914d61ea58b66be46517 SHA1 9955404dfe9ea8220980fea2c637b5fe67c9f789 SHA256 c867f9356e4772b171b755a5afa014471d141feb056d90d52b78c72888ecbd4d
-DIST eric5-i18n-en-5.2.0.tar.gz 162856 RMD160 4a64794d2a9b87fb10b103f6c742505e4aae99dd SHA1 fa1e7d7ff0619b09f154b445ec99e3d7189f3fea SHA256 9ddd8db9d2495c1efd43d51e4919f667420594b200db6ed7f0c18f1afc26eefe
 DIST eric5-i18n-en-5.2.2.tar.gz 162892 RMD160 baf7f391166878b0ab7050751a243fd14086af3c SHA1 bc8116f7f7f77e07d4bb4b64e6c54c21cac14655 SHA256 1117a1d19804e48ce16cd467f692eac1500c61bdeff496e82dea7e1d868927f1
-DIST eric5-i18n-es-5.2.0.tar.gz 606047 RMD160 db43cb4642f7f0c06a5f1fcd2ee24613cfb6748c SHA1 a6116f5d404718979fa57713593dfc13dd6d151f SHA256 09f086f6f76ad3476c975fc082680ae04e626b56b450f9f5fd7c8f954bd33f1f
 DIST eric5-i18n-es-5.2.2.tar.gz 605005 RMD160 1e8ad473a5a2ba45af0669ee9bd8f9d725a8401f SHA1 594795a46043c08ed6ecd838c3c5a4afc4fbe8bd SHA256 1148e28c0ff20b2ad624f4440d44dcba305d31be80ea94c05be624f9f8b81b26
-DIST eric5-i18n-fr-5.2.0.tar.gz 470679 RMD160 ff9ffae4dd6bdb8049b6727d3879f2532f6577b5 SHA1 bfc418ea36244aea27f9d85bae42eb3ae1878e0f SHA256 6c6e498db3245938e318c8ca9f02e85b9e096e9c7f6db9af277ff0ccf9c88a8e
 DIST eric5-i18n-fr-5.2.2.tar.gz 470781 RMD160 ce487280df33845e2994e52ffacfd4c3b0b856f8 SHA1 ed05db390a7b130187f7f07254e07f6e33048c55 SHA256 f7f27011e1abece8cc7e428cd2e64b4bbb7a6ea75413a730ab6c8ecf68700199
-DIST eric5-i18n-it-5.2.0.tar.gz 547717 RMD160 0f76d72c78382a39206a53628dcee17c28b33b2d SHA1 be5e360cebdcf67bc96510ed3d11f9f20d800f5c SHA256 421b503b9432f2da41a174cd44506ad3201abe19c5f6176c7a58a5f14242006c
 DIST eric5-i18n-it-5.2.2.tar.gz 547787 RMD160 675f2a389f3903139d977e4289087d48355e313d SHA1 e803bbc79d4b5fa7b510f76f8d57ec730f558a63 SHA256 431da789e2bec80b9b4a718d07922572ecf8ce87fa954cb2f8289a75f28c5673
-DIST eric5-i18n-ru-5.2.0.tar.gz 576765 RMD160 ca71a0534ecf087cdc8c33ccb6a47407ca79b90b SHA1 668d5fc1611611ed8f14960bcbbf1a0ab0004c31 SHA256 8b884c75f11882857987e17940e3ffbe5d524dc8288a8a33e74c4be3a1561d0d
 DIST eric5-i18n-ru-5.2.2.tar.gz 576848 RMD160 93b401f7c950a4e07ba3ce37ed0bb68ba70aef87 SHA1 7afd5cfdb2f9517a698f3e7e0ea5d8201e2e6a95 SHA256 077e300390c97d61149ca3133a6750f2080ab1b7b6ad9dc140ae96c6eb7f8c6b
-DIST eric5-i18n-tr-5.2.0.tar.gz 450185 RMD160 1b014674cff7067be972212e84b7271b1c54ea6f SHA1 84bacb905d68bc6905668dd1d70c23eee8ea18d8 SHA256 8ee63dbb8e60aef5952070045f991afa046f00600a5e2c1b59ccb8527e78b40f
 DIST eric5-i18n-tr-5.2.2.tar.gz 450198 RMD160 301324f6c942efcffe0a26a3707df6cec7807bed SHA1 525ad741ef1491c339a2f0d228c31bce8c459499 SHA256 ea8754403413cc18a96b9a10e7e9abbd2c4c5949b5da4c09acde822603ec62c1
-DIST eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz 436144 RMD160 b349bf407f2bc7e10f661898b06ddd4b34ad4e72 SHA1 b78df48cbde03c528593b2d85a3632db8e412562 SHA256 9d161d2f6e181d6205e7377c87b17310ba6fbf2a5ea94825be336e3b9fef304c
 DIST eric5-i18n-zh_CN.GB2312-5.2.2.tar.gz 436100 RMD160 3bac55e146e83817810a9f0e364378af6c0f7fa7 SHA1 6bd3e424fd1cd1fb3ebed80f038a96e52d95aee8 SHA256 ea6af74c413948ebae85a7e171854bd8f808c7ee3daaba928b3657912dd7a9e2
diff --git a/dev-util/eric/eric-4.5.0.ebuild b/dev-util/eric/eric-4.5.0.ebuild
deleted file mode 100644
index a6450130ca6c..000000000000
--- a/dev-util/eric/eric-4.5.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="4"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="kde spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.3
-	kde? ( kde-base/pykde4 )
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.0.1
-	>=dev-python/pygments-1.3.1
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
-	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
-
-	# Delete internal copies of dev-python/chardet, dev-python/coverage,
-	# dev-python/pygments and dev-python/simplejson.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/eric.png || die
-	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-4.5.3.ebuild b/dev-util/eric/eric-4.5.3.ebuild
index 8d8c8a3efa80..9a7237870d91 100644
--- a/dev-util/eric/eric-4.5.3.ebuild
+++ b/dev-util/eric/eric-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.3.ebuild,v 1.2 2012/06/02 22:00:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.3.ebuild,v 1.3 2012/06/03 17:50:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -21,7 +21,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="kde spell"
 
 DEPEND="
diff --git a/dev-util/eric/eric-5.2.0.ebuild b/dev-util/eric/eric-5.2.0.ebuild
deleted file mode 100644
index 4f1a73919e88..000000000000
--- a/dev-util/eric/eric-5.2.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
-
-EAPI="4"
-PYTHON_DEPEND="3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-SLOT="5"
-MY_PN="${PN}${SLOT}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="spell"
-
-DEPEND="
-	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.8[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.4
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4
-"
-PDEPEND="
-	spell? ( dev-python/pyenchant )
-"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
-		-i $(grep -lr "eric\.png" .) || die
-	mv eric/icons/default/eric{,5}.png || die
-	mv eric/pixmaps/eric{,5}.png || die
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet,
-	# dev-python/coverage and dev-python/pygments.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/${MY_PN}.png || die
-}
-
-pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-5.2.2.ebuild b/dev-util/eric/eric-5.2.2.ebuild
index c18025a7bcde..78b8a7bb141e 100644
--- a/dev-util/eric/eric-5.2.2.ebuild
+++ b/dev-util/eric/eric-5.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.2.ebuild,v 1.2 2012/06/02 22:00:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.2.ebuild,v 1.3 2012/06/03 17:50:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -20,7 +20,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="spell"
 
 DEPEND="
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index cc6db415799a..b7f9346ca7e9 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -5,7 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.37 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.38 2012/06/04 08:27:42 sera Exp $
 
 inherit java-utils-2
 
@@ -61,7 +61,6 @@ esac
 # ------------------------------------------------------------------------------
 java-pkg-2_pkg_setup() {
 	java-pkg_init
-	java-pkg_ensure-test
 }
 
 # ------------------------------------------------------------------------------
diff --git a/java-virtuals/jmx/jmx-1.0-r3.ebuild b/java-virtuals/jmx/jmx-1.0-r3.ebuild
index fa1d9f8b38f8..7730a65e022c 100644
--- a/java-virtuals/jmx/jmx-1.0-r3.ebuild
+++ b/java-virtuals/jmx/jmx-1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/jmx-1.0-r3.ebuild,v 1.1 2012/01/13 11:21:51 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/jmx-1.0-r3.ebuild,v 1.3 2012/06/04 08:39:59 johu Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
new file mode 100644
index 000000000000..4aa4c44cc3ce
--- /dev/null
+++ b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
@@ -0,0 +1,13 @@
+Index: icoutils-0.29.1/configure.ac
+===================================================================
+--- icoutils-0.29.1.orig/configure.ac
++++ icoutils-0.29.1/configure.ac
+@@ -26,7 +26,7 @@ gl_INIT
+ 
+ # Gettext
+ AM_GNU_GETTEXT([external])
+-# AM_GNU_GETTEXT_VERSION(0.14.1)
++AM_GNU_GETTEXT_VERSION(0.14.1)
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild b/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild
new file mode 100644
index 000000000000..d38467e698f2
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild,v 1.1 2012/06/03 18:04:15 hwoarang Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="http://savannah.nongnu.org/download/icoutils/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="media-libs/libpng
+		nls? ( virtual/libintl )
+		>=dev-lang/perl-5.6
+		>=dev-perl/libwww-perl-5.64"
+
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-locale.patch
+	epatch "${FILESDIR}"/${P}-gettext.patch
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		`use_enable nls` \
+		--disable-dependency-tracking || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
index 3bd09fe58678..1b2d18564c1b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.1 2012/05/31 19:12:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.2 2012/06/03 19:04:56 ssuominen Exp $
 
 EAPI=4
 
@@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	x86-fbsd? ( ${ASM_DEPEND} )
 	amd64-linux? ( ${ASM_DEPEND} )
 	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
 	java? ( >=virtual/jdk-1.5 )"
 
 src_prepare() {
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild
index 0755426a736c..e2f58d589727 100644
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild,v 1.4 2012/03/09 18:39:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild,v 1.5 2012/06/03 19:19:53 mattst88 Exp $
 
 EAPI=4
 
@@ -38,6 +38,10 @@ src_install() {
 	foreachabi autotools-utils_src_install
 }
 
+src_test() {
+	:;
+}
+
 pkg_postinst() {
 	ewarn "Depending on where you live, you might need a valid license for s3tc"
 	ewarn "in order to be legally allowed to use the external library."
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 7d7095f74d74..04ced30247af 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,3 +1,2 @@
-DIST vdr-live-0.2.0.20110419.tar.gz 1987984 RMD160 7740af3b6fb91e5b9fdde305094563e9fec3a7e3 SHA1 fffe8c2a86c628df8d56129580aee4dd7905e4aa SHA256 b3c2263e10f97b35f071a707b651922173b21b2b88f651cf4c788b330ca5fa2a
-DIST vdr-live-0.2.0.20120114.tar.gz 1993095 RMD160 3b982ba64171a458e530cfd388185ce20959f129 SHA1 28d1a3669d24a9ed3cbb41e4c21900dd96936fbd SHA256 fb1a931f282aa8282d6fa1a5ebac6a97cdfd59574b29b9413e7f498ea2723449
 DIST vdr-live-0.2.0.tar.gz 560582 RMD160 10f7196ecaaa99280a6032f5d8d80a6c73a1f8d6 SHA1 b9687db0c913026ae4d29d99cbc6f031f4f32d34 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
+DIST vdr-live-0.2.0_p20120325.tar.bz2 1992249 RMD160 422dca268cfc724e58ebce3b5b0960ff8d8d95f4 SHA1 0b30f815df95cd26a8b92e9c02d7a4f61b91abc4 SHA256 c73873d810d154ec7ebc167fad727e892ddabc523a601447b180ddd6f298a138
diff --git a/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
deleted file mode 100644
index 4eb296676621..000000000000
--- a/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9
-Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
-Date:   Sun Mar 25 16:42:12 2012 +0200
-
-    Updated LIVE to latest changes in vdr 1.7.27
-    - Do not use the direct access to cRecoding members any more.
-
-diff --git a/epg_events.cpp b/epg_events.cpp
-index a514769..cd4996e 100644
---- a/epg_events.cpp
-+++ b/epg_events.cpp
-@@ -182,12 +182,20 @@ namespace vdrlive
- 
- 	time_t EpgRecording::GetStartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	time_t EpgRecording::GetEndTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	const string EpgRecording::Name() const
-diff --git a/recman.cpp b/recman.cpp
-index fb315d2..6a2fc00 100644
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -383,7 +383,11 @@ namespace vdrlive {
- 
- 	time_t RecordingsItemRec::StartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording->start;
-+#else
-+		return m_recording->Start();
-+#endif
- 	}
- 
- 	long RecordingsItemRec::Duration() const
diff --git a/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
new file mode 100644
index 000000000000..d95ebd748c73
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
@@ -0,0 +1,44 @@
+From e154fec60a27d5a74e6940941f789e17d7169d54 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 01:42:31 +0200
+Subject: [PATCH] Compile fix for >=vdr-1.7.28
+
+---
+ tasks.cpp |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/tasks.cpp b/tasks.cpp
+index 9f20190..2a2b8d5 100644
+--- a/tasks.cpp
++++ b/tasks.cpp
+@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
+ 
+ 	const char *current = NowReplaying();
+ 	if (!current || (0 != strcmp(current, recording->FileName()))) {
++#if VDRVERSNUM >= 10728
++		cReplayControl::SetRecording( 0 );
++		cControl::Shutdown();
++		cReplayControl::SetRecording( recording->FileName() );
++#else
+ 		cReplayControl::SetRecording( 0, 0 );
+ 		cControl::Shutdown();
+ 		cReplayControl::SetRecording( recording->FileName(), recording->Title() );
++#endif
+ 		cControl::Launch( new cReplayControl );
+ 		cControl::Attach();
+ 	}
+@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
+ 		return;
+ 	}
+ 
++#if VDRVERSNUM >= 10728
++	cReplayControl::SetRecording( 0 );
++#else
+ 	cReplayControl::SetRecording( 0, 0 );
++#endif
+ 	cControl::Shutdown();
+ }
+ 
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/files/vdr-live_pcre.patch b/media-plugins/vdr-live/files/vdr-live_pcre.patch
new file mode 100644
index 000000000000..9767cca173a5
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live_pcre.patch
@@ -0,0 +1,26 @@
+From 6b2965a86a20c885fc1fae8d4dea24b29b38805e Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 02:29:55 +0200
+Subject: [PATCH] Make PCRE optional
+
+---
+ pages/recordings.ecpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index ebd57e0..8bdad66 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -1,6 +1,9 @@
+ <%pre>
+ #include <string>
++
++#ifdef HAVE_LIBPCRECPP
+ #include <pcrecpp.h>
++#endif
+ 
+ #include <vdr/plugin.h>
+ #include <vdr/config.h>
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild
deleted file mode 100644
index 340974bb1707..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20110419-r1.ebuild,v 1.1 2011/07/10 03:40:52 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin ssl-cert
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-#SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.0[ssl=,sdk]
-	>=dev-libs/cxxtools-2.0
-	>=dev-libs/libpcre-8.12[cxx]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
-
-make_live_cert() {
-	# ssl-cert eclass create invalide cert, create my own
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	#make it work with /bin/sh as indicated in the file header
-	sed -e "18s/==/=/" -i  buildutil/version-util
-
-	sed -e "s/ERROR:/WARNING:/" -i tntconfig.cpp
-
-	sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile
-
-	if ! has_version ">=media-video/vdr-1.7.13"; then
-	sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}/live"
-	insinto /etc/vdr/plugins/live
-	doins -r *
-
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "=media-plugins/vdr-epgsearch-0.9.25_beta* to search the EPG,"
-	elog "media-plugins/vdr-streamdev-0.5.0 for Live-TV streaming"
-	echo
-	elog "On first install use login:pass"
-	elog "\tadmin:live"
-	echo
-	ewarn "\t\tWARNiNG!!!"
-	einfo "\tBe carefull on testing the new feature:"
-	einfo "\tedit/rename/move recordings"
-	echo
-	ewarn "This is a developer snapshot"
-	einfo "On problems, use the stable amd64, x86 versions of"
-	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
-	echo
-	# Do not install live.{key,crt) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/vdr/plugins/live/live.key \
-		&& ! -f "${ROOT}"/etc/vdr/plugins/live/live.crt ]] ; then
-			make_live_cert
-			local base=$(get_base 1)
-			local keydir="/etc/vdr/plugins/live"
-			install -d "${ROOT}${keydir}"
-			install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-			install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-			chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
-	fi
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
similarity index 53%
rename from media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild
rename to media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
index 7fd065149b03..fec09cf63e0c 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
@@ -1,34 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild,v 1.1 2012/04/02 20:30:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild,v 1.1 2012/06/04 01:08:59 idl0r Exp $
 
 EAPI="4"
 
-inherit vdr-plugin ssl-cert
+inherit vdr-plugin-2 ssl-cert toolchain-funcs
 
 DESCRIPTION="VDR Plugin: Web Access To Settings"
 HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
+IUSE="pcre ssl"
 
 DEPEND="media-video/vdr
 	>=dev-libs/tntnet-2.0[ssl=,sdk]
 	>=dev-libs/cxxtools-2.0
-	>=dev-libs/libpcre-8.12[cxx]"
-
+	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${VDRPLUGIN}"
-
 VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
 VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
 
+S="${WORKDIR}/${P}"
+
 make_live_cert() {
-	# ssl-cert eclass create invalide cert, create my own
+	# TODO: still true?
+	# ssl-cert eclass creates a "invalid" cert, create our own one
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
 
 	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
 	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
@@ -40,73 +42,66 @@ make_live_cert() {
 	gen_csr 1 || return 1
 	gen_crt 1 || return 1
 	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }
 
-src_prepare() {
-	vdr-plugin_src_prepare
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
 
-	#make it work with /bin/sh as indicated in the file header
-	sed -e "18s/==/=/" -i  buildutil/version-util
+	tc-export CXX AR
+}
 
-	sed -e "s/ERROR:/WARNING:/" -i tntconfig.cpp
+src_prepare() {
+	vdr-plugin-2_src_prepare
 
-	sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
 
 	if ! has_version ">=media-video/vdr-1.7.13"; then
-	sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
+		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile || die
 	fi
 
-	epatch "${FILESDIR}/vdr-1.7.27-compatibility.patch"
+	epatch "${FILESDIR}/vdr-1.7.28-compatibility.patch"
+	epatch "${FILESDIR}/vdr-live_pcre.patch"
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
-	cd "${S}/live"
 	insinto /etc/vdr/plugins/live
-	doins -r *
+	doins -r live/*
 
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
+	fowners -R vdr:vdr /etc/vdr/plugins/live
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	elog "To be able to use all functions of vdr-live"
 	elog "you should emerge and enable"
-	elog "=media-plugins/vdr-epgsearch-0.9.25_beta* to search the EPG,"
-	elog "media-plugins/vdr-streamdev-0.5.0 for Live-TV streaming"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
 
-	elog "On first install use login:pass"
+	elog "The default username/password is:"
 	elog "\tadmin:live"
 
-	ewarn "\t\tWARNING!!!"
-	ewarn "This is a developer snapshot"
-	einfo "On problems, use the stable amd64, x86 versions of"
-	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
-
 	if use ssl ; then
 		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.key; then
-			einfo "found SSL cert"
-			einfo ""
-			einfo "to create a new SSL cert, run:"
+			einfo "found an existing SSL cert, to create a new SSL cert, run:"
 			einfo ""
 			einfo "emerge --config ${PN}"
 		else
-			einfo "NO SSL cert found"
-			einfo ""
-			einfo "Create SSL cert, now ..."
-			pkg_config
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
 		fi
 	fi
 }
 
 pkg_config() {
 	make_live_cert
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild
index c4085f040779..188c61432a20 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild,v 1.12 2011/01/08 17:01:47 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.6-r1.ebuild,v 1.14 2012/06/04 01:06:31 ssuominen Exp $
 
 DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
 HOMEPAGE="http://ax25.sourceforge.net/"
@@ -31,7 +31,7 @@ src_install() {
 	# FIXME: Configuration protect logic for the ax25rtd cache
 	#   or move these files
 	# Moving might require changes to ax25rtd/ax25rtctl
-	insinto /var/lib/ax25/ax25rtd
-	newins "${FILESDIR}"/ax25rtd.blank ax25_route
-	newins "${FILESDIR}"/ax25rtd.blank ip_route
+	dodir /var/lib/ax25/ax25rtd
+	touch "${D}"/var/lib/ax25/ax25rtd/ax25_route
+	touch "${D}"/var/lib/ax25/ax25rtd/ip_route
 }
diff --git a/media-sound/asunder/asunder-2.2.ebuild b/media-sound/asunder/asunder-2.2.ebuild
index 6125d26b490a..9d40cc57797a 100644
--- a/media-sound/asunder/asunder-2.2.ebuild
+++ b/media-sound/asunder/asunder-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/asunder-2.2.ebuild,v 1.2 2012/05/05 08:11:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/asunder-2.2.ebuild,v 1.3 2012/06/04 09:53:15 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="flac mp3 vorbis wavpack"
 
 COMMON_DEPEND=">=media-libs/libcddb-0.9.5
diff --git a/media-sound/mixxx/mixxx-1.10.0.ebuild b/media-sound/mixxx/mixxx-1.10.0.ebuild
index 505cc7314a8c..0c9b2848a252 100644
--- a/media-sound/mixxx/mixxx-1.10.0.ebuild
+++ b/media-sound/mixxx/mixxx-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.7 2012/05/25 14:02:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.8 2012/06/04 04:00:52 radhermit Exp $
 
 EAPI=4
 
@@ -29,6 +29,7 @@ RDEPEND="media-libs/fidlib
 	virtual/opengl
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
+	x11-libs/qt-sql:4
 	x11-libs/qt-svg:4
 	x11-libs/qt-webkit:4
 	x11-libs/qt-xmlpatterns:4
diff --git a/media-sound/rhythmbox/rhythmbox-2.95.ebuild b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
index a84d43cb92f1..56e4951569af 100644
--- a/media-sound/rhythmbox/rhythmbox-2.95.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.95.ebuild,v 1.5 2012/05/05 08:50:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.95.ebuild,v 1.6 2012/06/04 06:23:23 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -38,7 +38,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	>=dev-libs/totem-pl-parser-2.32.1
 	>=net-libs/libsoup-2.26:2.4
 	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.10.32:0.10
+	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 	>=sys-libs/tdb-1.2.6
 
diff --git a/media-sound/rhythmbox/rhythmbox-2.96.ebuild b/media-sound/rhythmbox/rhythmbox-2.96.ebuild
index bf92e5fe9c39..171d817fd1ab 100644
--- a/media-sound/rhythmbox/rhythmbox-2.96.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.96.ebuild,v 1.3 2012/05/05 08:50:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.96.ebuild,v 1.4 2012/06/04 06:23:23 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -38,7 +38,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=dev-libs/totem-pl-parser-2.32.1
 	>=net-libs/libsoup-2.26:2.4
 	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.10.32:0.10
+	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 	>=sys-libs/tdb-1.2.6
 
diff --git a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
index 9f635f3567dd..e9be3cd51043 100644
--- a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild,v 1.1 2011/12/24 17:49:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild,v 1.2 2012/06/04 09:51:13 ago Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="alsa debug"
 
 DEPEND="alsa? ( media-libs/alsa-lib )"
diff --git a/media-video/2mandvd/2mandvd-1.8.1.ebuild b/media-video/2mandvd/2mandvd-1.8.1.ebuild
new file mode 100644
index 000000000000..21258ec2af48
--- /dev/null
+++ b/media-video/2mandvd/2mandvd-1.8.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.8.1.ebuild,v 1.1 2012/06/03 21:08:57 hwoarang Exp $
+
+EAPI=4
+LANGS="cs de en it ru"
+
+inherit eutils qt4-r2
+
+MY_PN="2ManDVD"
+
+DESCRIPTION="The successor of ManDVD"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=99450"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="media-libs/libsdl
+	virtual/ffmpeg
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+"
+RDEPEND="${DEPEND}
+	|| ( app-cdr/cdrkit app-cdr/cdrtools )
+	dev-lang/perl
+	media-fonts/dejavu
+	media-gfx/exif
+	media-libs/netpbm
+	media-sound/sox
+	media-video/dvdauthor
+	media-video/ffmpegthumbnailer
+	media-video/mjpegtools
+	media-video/mplayer[encode]
+"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-const-char-concatenation.patch"
+	"${FILESDIR}/${PN}-1.7.3-libav.patch"
+)
+
+src_prepare() {
+	# Cleaning old backup files
+	find . -name "*~" -delete || die
+
+	for file in *.cpp; do
+		# Fix path
+		sed -e "s:qApp->applicationDirPath().\?+.\?\":\"/usr/share/${PN}:g" -i "${file}" || die "sed failed"
+		sed -e "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":g" -i "${file}" || die "sed failed"
+	done
+
+	# We'll make a newbin called ${PN} so we need to change references to the old "2ManDVD" (${MY_PN}).
+	# Sed is more flexible than a patch.
+	sed -e "s:openargument.right(${#MY_PN}) != \"${MY_PN}\":openargument.right(${#PN}) != \"${PN}\":" \
+		-e "s:openargument.right($(( ${#MY_PN} + 2 ))) != \"./${MY_PN}\":openargument.right($(( ${#PN} + 2 ))) != \"./${PN}\":" \
+		-i mainfrm.cpp || die "sed failed"
+
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+
+	# Data:
+	doins -r Bibliotheque
+	doins -r Interface
+
+	doins fake.pl
+
+	# Translations:
+	for lang in ${LINGUAS}; do
+		for x in ${LANGS}; do
+			[[ ${lang} == ${x} ]] && doins ${PN}_${x}.qm
+		done
+	done
+	[[ -z ${LINGUAS} ]] && doins ${PN}_en.qm
+
+	# Doc:
+	dodoc README.txt
+
+	# Bin and menu entry:
+	newbin 2ManDVD ${PN}
+	doicon Interface/mandvd.png
+	make_desktop_entry ${PN} ${MY_PN} mandvd "Qt;AudioVideo;Video"
+}
+
+pkg_postinst() {
+	elog "You may wish to install media-video/xine-ui and/or build"
+	elog "media-sound/sox with USE=mad for improved media handling support."
+}
diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest
index 523c25e79d22..91909b0f0d80 100644
--- a/media-video/2mandvd/Manifest
+++ b/media-video/2mandvd/Manifest
@@ -1 +1,2 @@
 DIST 2ManDVD-1.7.3.tar.gz 28644704 RMD160 1fdd35b734de05962602499cc91670559cc80f01 SHA1 8db491a9143f44ed29a0e0de4651a7cb229f5b2c SHA256 1faf635118f4b1295f8ac7bd39a6d549d07ecf91c426769b59bee41e2168902c
+DIST 2mandvd-1.8.1.tar.gz 29615342 RMD160 8d87e654afa11f6f8c91ac15ce0c3e069b8fa51c SHA1 eacf7f528b2791d29e5b325eeb38e73735200735 SHA256 cd1252afe1733d1aa2517947a6199369d6b946e50c75e1f9fd3445c1ff717d7a
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
index 4c0fb2920d96..17b3e1c23065 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild,v 1.2 2012/05/31 11:28:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.6.0.ebuild,v 1.4 2012/06/04 00:21:14 ssuominen Exp $
 
 EAPI=4
-
-inherit wxwidgets eutils
+inherit eutils toolchain-funcs versionator wxwidgets
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -39,6 +38,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	# http://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-system-pugixml.patch
 }
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
index 3379f3eb2755..c3a999fe6a74 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.4 2011/12/15 19:36:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.5 2012/06/04 01:29:35 xmw Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/media-video/totem/totem-3.2.2.ebuild b/media-video/totem/totem-3.2.2.ebuild
index 705d5b08d353..5aaa682ea53c 100644
--- a/media-video/totem/totem-3.2.2.ebuild
+++ b/media-video/totem/totem-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.3 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.4 2012/06/04 08:00:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -161,6 +161,13 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	# Work around sandbox violations when FEATURES=-userpriv caused by
+	# gst-inspect-0.10 (bug #358755, #419187)
+	unset DISPLAY
+	gnome2_src_configure
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
diff --git a/metadata/cache/app-admin/eselect-awk-0.2 b/metadata/cache/app-admin/eselect-awk-0.2
new file mode 100644
index 000000000000..bae954948121
--- /dev/null
+++ b/metadata/cache/app-admin/eselect-awk-0.2
@@ -0,0 +1,22 @@
+
+
+0
+http://dev.gentoo.org/~ottxor/distfiles/eselect-awk-0.2.tar.gz
+
+http://www.gentoo.org
+GPL-2
+Manages the {,/usr}/bin/awk symlink
+~x86
+
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/app-admin/eselect-boost-0.4 b/metadata/cache/app-admin/eselect-boost-0.4
index 5ab21d574748..421970991d51 100644
--- a/metadata/cache/app-admin/eselect-boost-0.4
+++ b/metadata/cache/app-admin/eselect-boost-0.4
@@ -6,7 +6,7 @@
 http://www.gentoo.org/proj/en/eselect/
 GPL-2
 boost module for eselect
-~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/app-admin/eselect-rails-0.18 b/metadata/cache/app-admin/eselect-rails-0.18
index f3f3ec7e0efb..bfd280436c15 100644
--- a/metadata/cache/app-admin/eselect-rails-0.18
+++ b/metadata/cache/app-admin/eselect-rails-0.18
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~flameeyes/ruby-team/eselect-rails-0.18.tar.bz2
 http://www.gentoo.org/
 GPL-2
 Manages Ruby on Rails symlinks
-~amd64 ~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
+amd64 ~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
 
 
 
diff --git a/metadata/cache/app-admin/logcheck-1.3.14 b/metadata/cache/app-admin/logcheck-1.3.14
index e799ba0df229..7717ef4d441e 100644
--- a/metadata/cache/app-admin/logcheck-1.3.14
+++ b/metadata/cache/app-admin/logcheck-1.3.14
@@ -6,7 +6,7 @@ mirror://debian/pool/main/l/logcheck/logcheck_1.3.14.tar.gz
 http://packages.debian.org/sid/logcheck
 GPL-2
 Mails anomalies in the system logfiles to the administrator.
-amd64 ~ppc ~sparc x86
+amd64 ppc ~sparc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-arch/lzip-1.13 b/metadata/cache/app-arch/lzip-1.13
index a2f6b5c3b2e0..b938e284e1be 100644
--- a/metadata/cache/app-arch/lzip-1.13
+++ b/metadata/cache/app-arch/lzip-1.13
@@ -6,7 +6,7 @@ http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.13.tar.gz
 http://www.nongnu.org/lzip/lzip.html
 GPL-3
 lossless data compressor based on the LZMA algorithm
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-arch/rpm-4.9.1.3 b/metadata/cache/app-arch/rpm-4.9.1.3
index e47f20d8b153..b994a76db132 100644
--- a/metadata/cache/app-arch/rpm-4.9.1.3
+++ b/metadata/cache/app-arch/rpm-4.9.1.3
@@ -6,7 +6,7 @@ http://rpm.org/releases/rpm-4.9.x/rpm-4.9.1.3.tar.bz2
 http://www.rpm.org
 GPL-2 LGPL-2
 Red Hat Package Management Utils
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 autotools base eutils flag-o-matic libtool multilib perl-module python toolchain-funcs user
 nls python doc caps lua acl
 
diff --git a/metadata/cache/app-backup/deja-dup-22.1 b/metadata/cache/app-backup/deja-dup-22.1
index 413ac3861148..083a58a76353 100644
--- a/metadata/cache/app-backup/deja-dup-22.1
+++ b/metadata/cache/app-backup/deja-dup-22.1
@@ -6,7 +6,7 @@ test
 https://launchpad.net/deja-dup/
 GPL-3
 Simple backup tool using duplicity back-end
-~amd64 ~x86
+amd64 ~x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 nautilus debug
 
diff --git a/metadata/cache/app-benchmarks/i7z-0.27.1 b/metadata/cache/app-benchmarks/i7z-0.27.1
index 5bdf33e5eedb..026a00d610da 100644
--- a/metadata/cache/app-benchmarks/i7z-0.27.1
+++ b/metadata/cache/app-benchmarks/i7z-0.27.1
@@ -6,7 +6,7 @@ http://i7z.googlecode.com/files/i7z-0.27.1.tar.gz
 http://code.google.com/p/i7z/
 GPL-2
 A better i7 (and now i3, i5) reporting tool for Linux
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 base eutils flag-o-matic multilib qt4-r2 toolchain-funcs user
 X
 
diff --git a/metadata/cache/app-cdr/cdw-0.7.1 b/metadata/cache/app-cdr/cdw-0.7.1
index 0c49b35d9cd1..2554775e77e5 100644
--- a/metadata/cache/app-cdr/cdw-0.7.1
+++ b/metadata/cache/app-cdr/cdw-0.7.1
@@ -6,7 +6,7 @@ mirror://sourceforge/cdw/cdw-0.7.1.tar.gz
 http://cdw.sourceforge.net
 GPL-2
 An ncurses based console frontend for cdrtools and dvd+rw-tools
-~amd64 ~ppc x86
+amd64 ~ppc x86
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-editors/gobby-0.4.13 b/metadata/cache/app-editors/gobby-0.4.13
index b70cb7515e98..90d651fbd483 100644
--- a/metadata/cache/app-editors/gobby-0.4.13
+++ b/metadata/cache/app-editors/gobby-0.4.13
@@ -6,7 +6,7 @@ test
 http://gobby.0x539.de/
 GPL-2
 GTK-based collaborative editor
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils multilib toolchain-funcs user
 avahi gnome
 
diff --git a/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r2 b/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r2
index ccd2267bcfd5..223a3d735d8b 100644
--- a/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r2
+++ b/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r2
@@ -6,7 +6,7 @@ mirror://gentoo/emacs-common-gentoo-1.3.tar.gz
 http://www.gentoo.org/proj/en/lisp/emacs/
 GPL-3
 Common files needed by all GNU Emacs versions
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 elisp-common eutils fdo-mime gnome2-utils multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/app-emulation/libvirt-0.9.11.3 b/metadata/cache/app-emulation/libvirt-0.9.11.3
index 4289f573f351..bc7b4b181300 100644
--- a/metadata/cache/app-emulation/libvirt-0.9.11.3
+++ b/metadata/cache/app-emulation/libvirt-0.9.11.3
@@ -1,5 +1,5 @@
-sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://libvirt.org/sources/libvirt-0.9.11.3.tar.gz ftp://libvirt.org/libvirt/libvirt-0.9.11.3.tar.gz
 
diff --git a/metadata/cache/app-emulation/libvirt-0.9.12 b/metadata/cache/app-emulation/libvirt-0.9.12
new file mode 100644
index 000000000000..3f1c7b27487d
--- /dev/null
+++ b/metadata/cache/app-emulation/libvirt-0.9.12
@@ -0,0 +1,22 @@
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+0
+http://libvirt.org/sources/libvirt-0.9.12.tar.gz ftp://libvirt.org/libvirt/libvirt-0.9.12.tar.gz
+
+http://www.libvirt.org/
+LGPL-2.1
+C toolkit to manipulate virtual machines
+~amd64 ~x86
+autotools eutils libtool multilib python toolchain-funcs user
+avahi +caps debug iscsi +libvirtd lvm +lxc macvtap nfs nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev uml virtualbox virt-network xen elibc_glibc
+libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+
+
+4
+
+configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/q4wine-0.999_rc7 b/metadata/cache/app-emulation/q4wine-0.999_rc7
new file mode 100644
index 000000000000..a03540793a04
--- /dev/null
+++ b/metadata/cache/app-emulation/q4wine-0.999_rc7
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite] dev-util/cmake >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( x11-libs/qt-dbus:4 )
+0
+mirror://sourceforge/q4wine/q4wine/q4wine%200.999-rc7/q4wine-0.999-rc7.tar.bz2
+
+http://q4wine.brezblock.org.ua/
+GPL-3
+Qt4 GUI configuration tool for Wine
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+debug +icoutils +wineappdb -dbus gnome kde linguas_cs linguas_de linguas_en linguas_es linguas_he linguas_it linguas_ru linguas_uk linguas_pl linguas_pt
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-misc/astrolog-5.40-r1 b/metadata/cache/app-misc/astrolog-5.40-r1
index 24df1bc430fe..dc2614e29573 100644
--- a/metadata/cache/app-misc/astrolog-5.40-r1
+++ b/metadata/cache/app-misc/astrolog-5.40-r1
@@ -6,7 +6,7 @@ http://www.astrolog.org/ftp/ast54unx.shr
 http://www.astrolog.org/astrolog.htm
 astrolog
 A many featured astrology chart calculation program
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 multilib toolchain-funcs
 X
 
diff --git a/metadata/cache/app-misc/ktoblzcheck-1.39 b/metadata/cache/app-misc/ktoblzcheck-1.39
new file mode 100644
index 000000000000..2e6fbcf3c707
--- /dev/null
+++ b/metadata/cache/app-misc/ktoblzcheck-1.39
@@ -0,0 +1,22 @@
+app-text/recode sys-apps/gawk sys-apps/grep sys-apps/sed || ( net-misc/wget www-client/lynx ) >=sys-devel/libtool-2.2.6b python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+app-text/recode sys-apps/gawk sys-apps/grep sys-apps/sed || ( net-misc/wget www-client/lynx ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+0
+mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.39.tar.gz
+
+http://ktoblzcheck.sourceforge.net/
+LGPL-2.1
+Library to check account numbers and bank codes of German banks
+~amd64 ~ppc ~ppc64 ~sparc ~x86
+multilib python toolchain-funcs
+python
+
+
+
+4
+
+configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-misc/lockfile-progs-0.1.16 b/metadata/cache/app-misc/lockfile-progs-0.1.16
index d95c6ae10b50..e2e4fb981f4a 100644
--- a/metadata/cache/app-misc/lockfile-progs-0.1.16
+++ b/metadata/cache/app-misc/lockfile-progs-0.1.16
@@ -6,7 +6,7 @@ mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_0.1.16.tar.gz
 http://packages.debian.org/sid/lockfile-progs
 GPL-2
 Programs to safely lock/unlock files and mailboxes
-~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86
+~amd64 ~arm ~mips ppc ~s390 ~sh ~sparc ~x86
 
 
 
diff --git a/metadata/cache/app-misc/muttprint-0.73-r1 b/metadata/cache/app-misc/muttprint-0.73-r1
index f33fafe3e353..277736b62b17 100644
--- a/metadata/cache/app-misc/muttprint-0.73-r1
+++ b/metadata/cache/app-misc/muttprint-0.73-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
 http://muttprint.sourceforge.net
 GPL-2
 Script for pretty printing of your mails
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 doc
 
diff --git a/metadata/cache/app-misc/pysmssend-1.48 b/metadata/cache/app-misc/pysmssend-1.48
index 50db7374587a..ae6f4caf2803 100644
--- a/metadata/cache/app-misc/pysmssend-1.48
+++ b/metadata/cache/app-misc/pysmssend-1.48
@@ -6,7 +6,7 @@ http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
 http://pysmssend.silverarrow.org/
 GPL-3
 Python Application for sending sms over multiple ISPs
-~amd64 ~x86
+amd64 ~x86
 distutils eutils multilib python toolchain-funcs user
 qt4
 
diff --git a/metadata/cache/app-shells/zsh-4.3.17 b/metadata/cache/app-shells/zsh-4.3.17
index a0cf0fcebf6a..2a7fab102018 100644
--- a/metadata/cache/app-shells/zsh-4.3.17
+++ b/metadata/cache/app-shells/zsh-4.3.17
@@ -6,7 +6,7 @@ mirror://sourceforge/zsh/zsh-4.3.17.tar.bz2 ftp://ftp.zsh.org/pub/zsh-4.3.17.tar
 http://www.zsh.org/
 ZSH gdbm? ( GPL-2 )
 UNIX Shell similar to the Korn shell
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils flag-o-matic multilib prefix toolchain-funcs user
 caps debug doc examples gdbm maildir pcre static unicode
 
diff --git a/metadata/cache/app-text/acroread-9.5.1-r1 b/metadata/cache/app-text/acroread-9.5.1-r1
new file mode 100644
index 000000000000..ce0131a863c2
--- /dev/null
+++ b/metadata/cache/app-text/acroread-9.5.1-r1
@@ -0,0 +1,22 @@
+dev-util/bsdiff >=sys-apps/sed-4
+media-libs/fontconfig x86? ( =dev-libs/openssl-0.9.8* ) cups? ( net-print/cups ) x86? ( x11-libs/gtk+:2 net-dns/libidn ldap? ( net-nds/openldap ) !minimal? ( || ( www-client/firefox www-client/firefox-bin www-client/seamonkey ) ) ) amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )
+0
+linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 ) !linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 )
+strip mirror
+http://www.adobe.com/products/reader/
+Adobe
+Adobe's PDF reader
+-* ~amd64 ~x86
+eutils gnome2-utils multilib nsplugins toolchain-funcs user
+cups ldap minimal nsplugin linguas_en linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko
+
+
+
+4
+
+install postinst postrm preinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-text/lcdf-typetools-2.92 b/metadata/cache/app-text/lcdf-typetools-2.92
index 7cb47147ecfc..db44dd1ebb43 100644
--- a/metadata/cache/app-text/lcdf-typetools-2.92
+++ b/metadata/cache/app-text/lcdf-typetools-2.92
@@ -6,7 +6,7 @@ http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz
 http://www.lcdf.org/type/#typetools
 GPL-2
 Font utilities for eg manipulating OTF
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 +kpathsea
 
diff --git a/metadata/cache/app-text/pep-2.8 b/metadata/cache/app-text/pep-2.8
index 5d9a0a3b0dc8..eca14a3b768a 100644
--- a/metadata/cache/app-text/pep-2.8
+++ b/metadata/cache/app-text/pep-2.8
@@ -7,7 +7,7 @@ http://folk.uio.no/gisle/enjoy/pep.html
 GPL-2
 General purpose filter and file cleaning program
 ~mips ppc sparc x86 ~x86-linux ~ppc-macos
-eutils multilib toolchain-funcs user
+eutils flag-o-matic multilib toolchain-funcs user
 
 
 
diff --git a/metadata/cache/app-text/t1utils-1.37 b/metadata/cache/app-text/t1utils-1.37
index 9c30b06ad64a..0419bb24168f 100644
--- a/metadata/cache/app-text/t1utils-1.37
+++ b/metadata/cache/app-text/t1utils-1.37
@@ -6,7 +6,7 @@ http://www.lcdf.org/type/t1utils-1.37.tar.gz
 http://www.lcdf.org/type/#t1utils
 BSD
 Type 1 Font utilities
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-xemacs/gentoo-syntax-1.19 b/metadata/cache/app-xemacs/gentoo-syntax-1.19
index 3716615dd900..afd2fbd0aa3f 100644
--- a/metadata/cache/app-xemacs/gentoo-syntax-1.19
+++ b/metadata/cache/app-xemacs/gentoo-syntax-1.19
@@ -6,7 +6,7 @@ mirror://gentoo/gentoo-syntax-1.19.tar.bz2
 http://www.gentoo.org/proj/en/lisp/emacs/index.xml
 GPL-2
 An Emacs mode for editing ebuilds and other Gentoo specific files.
-~amd64 ~x86
+amd64 ~x86
 eutils multilib toolchain-funcs user xemacs-elisp xemacs-elisp-common
 
 
diff --git a/metadata/cache/dev-cpp/ETL-0.04.15 b/metadata/cache/dev-cpp/ETL-0.04.15
index c585c4e8c349..c6c49db9e69c 100644
--- a/metadata/cache/dev-cpp/ETL-0.04.15
+++ b/metadata/cache/dev-cpp/ETL-0.04.15
@@ -6,7 +6,7 @@ mirror://sourceforge/synfig/ETL/0.04.15/ETL-0.04.15.tar.gz
 http://synfig.org
 GPL-2
 ETL is a multi-platform class and template library
-~amd64
+~amd64 ~x86
 autotools libtool multilib toolchain-funcs
 
 
diff --git a/metadata/cache/dev-db/tinycdb-0.77-r2 b/metadata/cache/dev-db/tinycdb-0.77-r2
index c8d53af7dfdb..1c7152c3dfe6 100644
--- a/metadata/cache/dev-db/tinycdb-0.77-r2
+++ b/metadata/cache/dev-db/tinycdb-0.77-r2
@@ -6,7 +6,7 @@ test
 http://www.corpit.ru/mjt/tinycdb.html
 public-domain
 TinyCDB is a very fast and simple package for creating and reading constant data bases
-~amd64 ~hppa ~ia64 ~ppc ~x86
+amd64 ~hppa ~ia64 ~ppc ~x86
 eutils multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.9 b/metadata/cache/dev-java/commons-daemon-1.0.9
index 1114d920992b..8dac7133c30e 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/cache/dev-java/commons-daemon-1.0.9
@@ -6,7 +6,7 @@ mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
 http://commons.apache.org/daemon/
 Apache-2.0
 Tools to allow Java programs to run as UNIX daemons
-amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 autotools eutils java-ant-2 java-pkg-2 java-utils-2 libtool multilib toolchain-funcs user versionator
 kernel_linux elibc_FreeBSD doc examples source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/commons-fileupload-1.2.1-r1 b/metadata/cache/dev-java/commons-fileupload-1.2.1-r1
index fb5668c2e2d2..6faa272b96b0 100644
--- a/metadata/cache/dev-java/commons-fileupload-1.2.1-r1
+++ b/metadata/cache/dev-java/commons-fileupload-1.2.1-r1
@@ -6,7 +6,7 @@ mirror://apache/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
 http://commons.apache.org/fileupload/
 Apache-2.0
 Add robust, high-performance, file upload capability to your servlets and web applications.
-~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/jakarta-oro-2.0.8-r3 b/metadata/cache/dev-java/jakarta-oro-2.0.8-r3
index 181776ec2481..378852a8df33 100644
--- a/metadata/cache/dev-java/jakarta-oro-2.0.8-r3
+++ b/metadata/cache/dev-java/jakarta-oro-2.0.8-r3
@@ -6,7 +6,7 @@ mirror://apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
 http://jakarta.apache.org/oro/index.html
 Apache-1.1
 A set of text-processing Java classes.
-~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc examples source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/lucene-3.0.3 b/metadata/cache/dev-java/lucene-3.0.3
index 985dbef01919..12bbd109d1c1 100644
--- a/metadata/cache/dev-java/lucene-3.0.3
+++ b/metadata/cache/dev-java/lucene-3.0.3
@@ -6,7 +6,7 @@ mirror://apache/lucene/java/lucene-3.0.3-src.tar.gz
 http://lucene.apache.org
 Apache-2.0
 High-performance, full-featured text search engine written entirely in Java
-~amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
+~amd64 ppc x86 ~amd64-fbsd ~x86-fbsd
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/lzmajio-0.95 b/metadata/cache/dev-java/lzmajio-0.95
index 5dc41662ad8a..25bc0ff0efd3 100644
--- a/metadata/cache/dev-java/lzmajio-0.95
+++ b/metadata/cache/dev-java/lzmajio-0.95
@@ -6,7 +6,7 @@ http://comsci.liu.edu/~league/dist/lzmajio/lzmajio-0.95.tar.gz
 http://contrapunctus.net/league/haques/lzmajio/
 LGPL-2.1
 Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders
-~amd64 ~x86
+amd64 x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/saaj-1.3.19-r1 b/metadata/cache/dev-java/saaj-1.3.19-r1
index 7b8dd369d1f7..07b56932cd15 100644
--- a/metadata/cache/dev-java/saaj-1.3.19-r1
+++ b/metadata/cache/dev-java/saaj-1.3.19-r1
@@ -6,7 +6,7 @@ https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
 https://saaj.dev.java.net/
 CDDL
 SOAP with Attachments API for Java
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD examples source test elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/tomcat-servlet-api-7.0.27 b/metadata/cache/dev-java/tomcat-servlet-api-7.0.27
index 1840d0e03356..6b012d9e7b98 100644
--- a/metadata/cache/dev-java/tomcat-servlet-api-7.0.27
+++ b/metadata/cache/dev-java/tomcat-servlet-api-7.0.27
@@ -6,7 +6,7 @@ mirror://apache/tomcat/tomcat-7/v7.0.27/src/apache-tomcat-7.0.27-src.tar.gz
 http://tomcat.apache.org/
 Apache-2.0
 Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-libs/boost-1.48.0-r2 b/metadata/cache/dev-libs/boost-1.48.0-r2
index 7e5b4c89ae64..bfa8a7846867 100644
--- a/metadata/cache/dev-libs/boost-1.48.0-r2
+++ b/metadata/cache/dev-libs/boost-1.48.0-r2
@@ -6,7 +6,7 @@ mirror://sourceforge/boost/boost_1_48_0.tar.bz2
 http://www.boost.org/
 Boost-1.0
 Boost Libraries for C++
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 check-reqs eutils flag-o-matic multilib python toolchain-funcs user versionator
 debug doc +eselect icu mpi python static-libs test tools
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-0.10.8 b/metadata/cache/dev-libs/gobject-introspection-0.10.8
index 497cbbcaa529..7394def1f49d 100644
--- a/metadata/cache/dev-libs/gobject-introspection-0.10.8
+++ b/metadata/cache/dev-libs/gobject-introspection-0.10.8
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.24:2 virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=dev-libs/glib-2.24:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.24:2 virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.24:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
 mirror://gnome/sources/gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-1.30.0-r1 b/metadata/cache/dev-libs/gobject-introspection-1.30.0-r1
index ac18c01f4c5e..06731a09d722 100644
--- a/metadata/cache/dev-libs/gobject-introspection-1.30.0-r1
+++ b/metadata/cache/dev-libs/gobject-introspection-1.30.0-r1
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) test? ( x11-libs/cairo ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) test? ( x11-libs/cairo ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
+>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
 mirror://gnome/sources/gobject-introspection/1.30/gobject-introspection-1.30.0.tar.xz mirror://gentoo/gobject-introspection-1.30.0-patches-1.tar.xz
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-1.30.0-r2 b/metadata/cache/dev-libs/gobject-introspection-1.30.0-r2
index 435f30987967..761ec710fefa 100644
--- a/metadata/cache/dev-libs/gobject-introspection-1.30.0-r2
+++ b/metadata/cache/dev-libs/gobject-introspection-1.30.0-r2
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
+>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
 mirror://gnome/sources/gobject-introspection/1.30/gobject-introspection-1.30.0.tar.xz mirror://gentoo/gobject-introspection-1.30.0-patches-1.tar.xz
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-1.32.0 b/metadata/cache/dev-libs/gobject-introspection-1.32.0
index e5daa4389e49..62fe7736be38 100644
--- a/metadata/cache/dev-libs/gobject-introspection-1.32.0
+++ b/metadata/cache/dev-libs/gobject-introspection-1.32.0
@@ -1,5 +1,5 @@
->=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7*
->=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7*
+>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 0
 mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.0.tar.xz
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-1.32.1 b/metadata/cache/dev-libs/gobject-introspection-1.32.1
index 3b20a79ef6b4..c299c5d4d9bd 100644
--- a/metadata/cache/dev-libs/gobject-introspection-1.32.1
+++ b/metadata/cache/dev-libs/gobject-introspection-1.32.1
@@ -1,5 +1,5 @@
->=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7*
->=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7*
+>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 0
 mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz
 
diff --git a/metadata/cache/dev-libs/icu-49.1.1-r1 b/metadata/cache/dev-libs/icu-49.1.1-r1
index 78ae8fb21ea9..2cd174ccef12 100644
--- a/metadata/cache/dev-libs/icu-49.1.1-r1
+++ b/metadata/cache/dev-libs/icu-49.1.1-r1
@@ -6,8 +6,8 @@ http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-src.tgz doc? ( h
 http://www.icu-project.org/
 BSD
 International Components for Unicode
-alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-eutils multilib toolchain-funcs user versionator
+alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+eutils flag-o-matic multilib toolchain-funcs user versionator
 debug doc examples static-libs
 
 
diff --git a/metadata/cache/dev-libs/json-c-0.9-r1 b/metadata/cache/dev-libs/json-c-0.9-r1
index edd0ae069731..c107a8ac4f93 100644
--- a/metadata/cache/dev-libs/json-c-0.9-r1
+++ b/metadata/cache/dev-libs/json-c-0.9-r1
@@ -6,7 +6,7 @@ http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz
 http://oss.metaparadigm.com/json-c/
 MIT
 A JSON implementation in C
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 
 static-libs
 
diff --git a/metadata/cache/dev-libs/libxml2-2.8.0-r1 b/metadata/cache/dev-libs/libxml2-2.8.0-r1
index 632cc4e98e6e..ac66410bd576 100644
--- a/metadata/cache/dev-libs/libxml2-2.8.0-r1
+++ b/metadata/cache/dev-libs/libxml2-2.8.0-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) python? ( dev-util/fix-la-relink-command ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 2
 ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz )
diff --git a/metadata/cache/dev-libs/uriparser-0.7.7 b/metadata/cache/dev-libs/uriparser-0.7.7
index 284fcc9d6870..edc0d1cdeb70 100644
--- a/metadata/cache/dev-libs/uriparser-0.7.7
+++ b/metadata/cache/dev-libs/uriparser-0.7.7
@@ -6,7 +6,7 @@ mirror://sourceforge/uriparser/uriparser-0.7.7.tar.bz2
 http://uriparser.sourceforge.net/
 BSD
 Uriparser is a strictly RFC 3986 compliant URI parsing library in C
-amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils multilib toolchain-funcs user
 doc qt4 test unicode
 test? ( unicode )
diff --git a/metadata/cache/dev-perl/Audio-FLAC-Header-2.3 b/metadata/cache/dev-perl/Audio-FLAC-Header-2.3
deleted file mode 100644
index 38b8fef09feb..000000000000
--- a/metadata/cache/dev-perl/Audio-FLAC-Header-2.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/flac dev-lang/perl
-media-libs/flac dev-lang/perl
-0
-mirror://cpan/authors/id/D/DA/DANIEL/Audio-FLAC-Header-2.3.tar.gz
-
-http://search.cpan.org/dist/Audio-FLAC-Header/
-|| ( Artistic GPL-2 )
-Access to FLAC audio metadata
-amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/CGI-Session-4.41 b/metadata/cache/dev-perl/CGI-Session-4.41
deleted file mode 100644
index e0d6717a4ce0..000000000000
--- a/metadata/cache/dev-perl/CGI-Session-4.41
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=virtual/perl-CGI-3.26 virtual/perl-Module-Build test? ( virtual/perl-Test-Simple dev-perl/Cgi-Simple dev-perl/Test-Pod ) dev-lang/perl[-build]
-virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=virtual/perl-CGI-3.26 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.41.tar.gz
-
-http://search.cpan.org/dist/CGI-Session/
-|| ( Artistic GPL-2 )
-persistent session data in CGI applications
-amd64 ~ppc x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/CPAN-Mini-Inject-0.18 b/metadata/cache/dev-perl/CPAN-Mini-Inject-0.18
deleted file mode 100644
index 60fd35093898..000000000000
--- a/metadata/cache/dev-perl/CPAN-Mini-Inject-0.18
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/libwww-perl virtual/perl-IO-Compress dev-perl/HTTP-Server-Simple >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-lang/perl
-dev-perl/libwww-perl virtual/perl-IO-Compress dev-perl/HTTP-Server-Simple >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-lang/perl
-0
-mirror://cpan/authors/id/S/SS/SSORICHE/CPAN-Mini-Inject-0.18.tar.gz
-
-http://search.cpan.org/~ssoriche/CPAN-Mini-Inject-0.18/
-Artistic
-Inject modules into a CPAN::Mini mirror.
-x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/CPAN-Mini-Inject-0.300.0 b/metadata/cache/dev-perl/CPAN-Mini-Inject-0.300.0
deleted file mode 100644
index 85e5af8e44e5..000000000000
--- a/metadata/cache/dev-perl/CPAN-Mini-Inject-0.300.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/libwww-perl virtual/perl-IO-Compress virtual/perl-Archive-Tar virtual/perl-File-Path virtual/perl-File-Temp >=virtual/perl-Module-Build-0.380.0 >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-perl/File-Slurp dev-perl/yaml dev-lang/perl[-build]
-dev-perl/libwww-perl virtual/perl-IO-Compress virtual/perl-Archive-Tar virtual/perl-File-Path virtual/perl-File-Temp >=virtual/perl-Module-Build-0.380.0 >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-perl/File-Slurp dev-perl/yaml dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/M/MI/MITHALDU/CPAN-Mini-Inject-0.30.tar.gz
-
-http://search.cpan.org/dist/CPAN-Mini-Inject/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Inject modules into a CPAN::Mini mirror.
-~amd64 ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Cairo-1.06.0 b/metadata/cache/dev-perl/Cairo-1.06.0
deleted file mode 100644
index 39143c39918b..000000000000
--- a/metadata/cache/dev-perl/Cairo-1.06.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 test? ( dev-perl/Test-Number-Delta )
->=x11-libs/cairo-1.0.0
-0
-mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.060.tar.gz
-
-http://search.cpan.org/dist/Cairo/
-LGPL-2.1
-Perl interface to the cairo library
-alpha amd64 hppa ia64 ppc ppc64 sparc x86
-base eutils multilib perl-module toolchain-funcs user versionator
-test
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Cairo-1.62.0 b/metadata/cache/dev-perl/Cairo-1.62.0
deleted file mode 100644
index 6ed8f54e1da7..000000000000
--- a/metadata/cache/dev-perl/Cairo-1.62.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
->=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.062.tar.gz
-
-http://search.cpan.org/dist/Cairo/
-LGPL-2.1
-Perl interface to the cairo library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Cairo-1.81.0 b/metadata/cache/dev-perl/Cairo-1.81.0
deleted file mode 100644
index 70cfa5f9c89a..000000000000
--- a/metadata/cache/dev-perl/Cairo-1.81.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205.0 >=dev-perl/extutils-pkgconfig-1.70.0 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
->=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.081.tar.gz
-
-http://search.cpan.org/dist/Cairo/
-LGPL-2.1
-Perl interface to the cairo library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Cairo-1.82.0 b/metadata/cache/dev-perl/Cairo-1.82.0
deleted file mode 100644
index 275b7e0d6bbe..000000000000
--- a/metadata/cache/dev-perl/Cairo-1.82.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205.0 >=dev-perl/extutils-pkgconfig-1.70.0 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
->=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.082.tar.gz
-
-http://search.cpan.org/dist/Cairo/
-LGPL-2.1
-Perl interface to the cairo library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Capture-Tiny-0.08 b/metadata/cache/dev-perl/Capture-Tiny-0.08
deleted file mode 100644
index e61e07c53b43..000000000000
--- a/metadata/cache/dev-perl/Capture-Tiny-0.08
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.08.tar.gz
-
-http://search.cpan.org/dist/Capture-Tiny/
-Apache-2.0
-Capture STDOUT and STDERR from Perl, XS or external programs
-amd64 x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Capture-Tiny-0.110.0 b/metadata/cache/dev-perl/Capture-Tiny-0.110.0
deleted file mode 100644
index a318112aab4a..000000000000
--- a/metadata/cache/dev-perl/Capture-Tiny-0.110.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.11.tar.gz
-
-http://search.cpan.org/dist/Capture-Tiny/
-Apache-2.0
-Capture STDOUT and STDERR from Perl, XS or external programs
-~amd64 ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Capture-Tiny-0.120.0 b/metadata/cache/dev-perl/Capture-Tiny-0.120.0
deleted file mode 100644
index 1e12cd7d257c..000000000000
--- a/metadata/cache/dev-perl/Capture-Tiny-0.120.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.12.tar.gz
-
-http://search.cpan.org/dist/Capture-Tiny/
-Apache-2.0
-Capture STDOUT and STDERR from Perl, XS or external programs
-~amd64 ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Capture-Tiny-0.150.0 b/metadata/cache/dev-perl/Capture-Tiny-0.150.0
deleted file mode 100644
index cb09a2037f41..000000000000
--- a/metadata/cache/dev-perl/Capture-Tiny-0.150.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.15.tar.gz
-
-http://search.cpan.org/dist/Capture-Tiny/
-Apache-2.0
-Capture STDOUT and STDERR from Perl, XS or external programs
-~alpha ~amd64 hppa ~ia64 ~ppc ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Capture-Tiny-0.160.0 b/metadata/cache/dev-perl/Capture-Tiny-0.160.0
deleted file mode 100644
index 7fa54e196846..000000000000
--- a/metadata/cache/dev-perl/Capture-Tiny-0.160.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.16.tar.gz
-
-http://search.cpan.org/dist/Capture-Tiny/
-Apache-2.0
-Capture STDOUT and STDERR from Perl, XS or external programs
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Class-Accessor-0.31 b/metadata/cache/dev-perl/Class-Accessor-0.31
deleted file mode 100644
index a43bea65792b..000000000000
--- a/metadata/cache/dev-perl/Class-Accessor-0.31
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl
-dev-lang/perl
-0
-mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz
-
-http://search.cpan.org/~kasei/Class-Accessor-0.31/
-|| ( Artistic GPL-2 )
-Automated accessor generation
-alpha amd64 hppa ia64 ppc ppc64 sparc x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.57 b/metadata/cache/dev-perl/Config-IniFiles-2.57
deleted file mode 100644
index 96a0b58fac31..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.57
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.57.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-alpha amd64 ppc x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.680.0 b/metadata/cache/dev-perl/Config-IniFiles-2.680.0
deleted file mode 100644
index 7716376514e9..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.680.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.68.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-~alpha ~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.690.0 b/metadata/cache/dev-perl/Config-IniFiles-2.690.0
deleted file mode 100644
index 0845044ee1e4..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.690.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.69.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-~alpha ~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.700.0 b/metadata/cache/dev-perl/Config-IniFiles-2.700.0
deleted file mode 100644
index 38929948adcc..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.700.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.70.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-~alpha ~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.720.0 b/metadata/cache/dev-perl/Config-IniFiles-2.720.0
deleted file mode 100644
index b1009ef214f5..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.720.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy dev-perl/List-MoreUtils >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-perl/List-MoreUtils dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.72.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-~alpha ~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Config-IniFiles-2.730.0 b/metadata/cache/dev-perl/Config-IniFiles-2.730.0
deleted file mode 100644
index 40bc14bd0fad..000000000000
--- a/metadata/cache/dev-perl/Config-IniFiles-2.730.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-stringy dev-perl/List-MoreUtils >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-perl/IO-stringy dev-perl/List-MoreUtils dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.73.tar.gz
-
-http://search.cpan.org/dist/Config-IniFiles/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A module for reading .ini-style configuration files
-~alpha ~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Crypt-Blowfish-2.10 b/metadata/cache/dev-perl/Crypt-Blowfish-2.10
deleted file mode 100644
index 2126c22ea406..000000000000
--- a/metadata/cache/dev-perl/Crypt-Blowfish-2.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5
->=dev-lang/perl-5
-0
-mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.10.tar.gz
-
-http://search.cpan.org/~dparis/
-|| ( Artistic GPL-2 )
-Crypt::Blowfish module for perl
-alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Crypt-Cracklib-1.5 b/metadata/cache/dev-perl/Crypt-Cracklib-1.5
deleted file mode 100644
index 9f150e39c05b..000000000000
--- a/metadata/cache/dev-perl/Crypt-Cracklib-1.5
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/cracklib test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-sys-libs/cracklib dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.5.tar.gz
-
-http://search.cpan.org/dist/Crypt-Cracklib/
-Artistic
-Perl interface to Alec Muffett's Cracklib
-amd64 x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Devel-StackTrace-1.22 b/metadata/cache/dev-perl/Devel-StackTrace-1.22
deleted file mode 100644
index e1c2c9a49005..000000000000
--- a/metadata/cache/dev-perl/Devel-StackTrace-1.22
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-Module-Build-0.28 virtual/perl-File-Spec dev-lang/perl[-build]
-virtual/perl-File-Spec dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.22.tar.gz
-
-http://search.cpan.org/dist/Devel-StackTrace/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Devel-StackTrace module for perl
-alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Digest-HMAC-1.01-r1 b/metadata/cache/dev-perl/Digest-HMAC-1.01-r1
deleted file mode 100644
index b82e8fa6d8d7..000000000000
--- a/metadata/cache/dev-perl/Digest-HMAC-1.01-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-digest-base virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl
-virtual/perl-digest-base virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl
-0
-mirror://cpan/authors/id/GAAS/Digest-HMAC-1.01.tar.gz
-
-http://search.cpan.org/doc/GAAS/
-|| ( Artistic GPL-2 )
-Keyed Hashing for Message Authentication
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Digest-HMAC-1.02 b/metadata/cache/dev-perl/Digest-HMAC-1.02
deleted file mode 100644
index cf83b6e0544c..000000000000
--- a/metadata/cache/dev-perl/Digest-HMAC-1.02
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl[-build]
-virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.02.tar.gz
-
-http://search.cpan.org/dist/Digest-HMAC/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Keyed Hashing for Message Authentication
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Digest-HMAC-1.30.0 b/metadata/cache/dev-perl/Digest-HMAC-1.30.0
index 79a0749e6447..34d59b8e034b 100644
--- a/metadata/cache/dev-perl/Digest-HMAC-1.30.0
+++ b/metadata/cache/dev-perl/Digest-HMAC-1.30.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
 http://search.cpan.org/dist/Digest-HMAC/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Keyed Hashing for Message Authentication
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/File-Remove-1.42 b/metadata/cache/dev-perl/File-Remove-1.42
deleted file mode 100644
index cc797befc216..000000000000
--- a/metadata/cache/dev-perl/File-Remove-1.42
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-File-Spec-0.84 dev-lang/perl
->=virtual/perl-File-Spec-0.84 dev-lang/perl
-0
-mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.42.tar.gz
-
-http://search.cpan.org/dist/File-Remove/
-|| ( Artistic GPL-2 )
-Remove files and directories
-alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/File-Remove-1.500.0 b/metadata/cache/dev-perl/File-Remove-1.500.0
deleted file mode 100644
index 378d67d89194..000000000000
--- a/metadata/cache/dev-perl/File-Remove-1.500.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
->=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.50.tar.gz
-
-http://search.cpan.org/dist/File-Remove/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Remove files and directories
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Fuse-0.08 b/metadata/cache/dev-perl/Fuse-0.08
deleted file mode 100644
index 4171ad11d1d1..000000000000
--- a/metadata/cache/dev-perl/Fuse-0.08
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-fs/fuse dev-lang/perl
-sys-fs/fuse dev-lang/perl
-0
-mirror://cpan/authors/id/D/DP/DPAVLIN/Fuse-0.08.tar.gz
-
-http://search.cpan.org/dist/Fuse/
-GPL-2
-Fuse module for perl
-amd64 ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Fuse-0.130.0 b/metadata/cache/dev-perl/Fuse-0.130.0
deleted file mode 100644
index 1d80f1d3ebdc..000000000000
--- a/metadata/cache/dev-perl/Fuse-0.130.0
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-fs/fuse dev-lang/perl[-build]
-sys-fs/fuse dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/D/DP/DPAVLIN/Fuse-0.13.tar.gz
-
-http://search.cpan.org/dist/Fuse/
-GPL-2
-Fuse module for perl
-~amd64 ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/GStreamer-0.09 b/metadata/cache/dev-perl/GStreamer-0.09
deleted file mode 100644
index 8dd2498ea11b..000000000000
--- a/metadata/cache/dev-perl/GStreamer-0.09
+++ /dev/null
@@ -1,22 +0,0 @@
-=media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.120 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig
-=media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.120
-0
-mirror://cpan/authors/id/T/TS/TSCH/GStreamer-0.09.tar.gz
-
-http://search.cpan.org/~tsch/
-GPL-2
-Perl bindings for GStreamer
-amd64 ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/GStreamer-0.160.0 b/metadata/cache/dev-perl/GStreamer-0.160.0
deleted file mode 100644
index c87323b46f3c..000000000000
--- a/metadata/cache/dev-perl/GStreamer-0.160.0
+++ /dev/null
@@ -1,22 +0,0 @@
-=media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.180 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig dev-lang/perl[-build]
-=media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.180 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/GStreamer-0.16.tar.gz
-
-http://search.cpan.org/dist/GStreamer/
-LGPL-2.1
-Perl bindings for GStreamer
-~amd64 ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/GStreamer-Interfaces-0.04 b/metadata/cache/dev-perl/GStreamer-Interfaces-0.04
deleted file mode 100644
index 2a859b33fe64..000000000000
--- a/metadata/cache/dev-perl/GStreamer-Interfaces-0.04
+++ /dev/null
@@ -1,22 +0,0 @@
-=media-libs/gst-plugins-base-0.10* >=dev-perl/GStreamer-0.06 >=dev-perl/glib-perl-1.180 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig
-=media-libs/gst-plugins-base-0.10* >=dev-perl/GStreamer-0.06 >=dev-perl/glib-perl-1.180
-0
-mirror://cpan/authors/id/T/TS/TSCH/GStreamer-Interfaces-0.04.tar.gz
-
-http://search.cpan.org/~tsch
-GPL-2
-Perl interface to the GStreamer Interfaces library
-amd64 ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/GnuPG-Interface-0.42 b/metadata/cache/dev-perl/GnuPG-Interface-0.42
deleted file mode 100644
index 3cc5aa52f62f..000000000000
--- a/metadata/cache/dev-perl/GnuPG-Interface-0.42
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/gnupg-1.2.1-r1 dev-perl/Any-Moose dev-lang/perl[-build]
->=app-crypt/gnupg-1.2.1-r1 dev-perl/Any-Moose dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-0.42.tar.gz
-
-http://search.cpan.org/dist/GnuPG-Interface/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-GnuPG::Interface is a Perl module interface to interacting with GnuPG.
-amd64 hppa ppc x86 ~ppc-macos
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/GnuPG-Interface-0.440.0 b/metadata/cache/dev-perl/GnuPG-Interface-0.440.0
deleted file mode 100644
index 2c57d47542e7..000000000000
--- a/metadata/cache/dev-perl/GnuPG-Interface-0.440.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl[-build]
->=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-0.44.tar.gz
-
-http://search.cpan.org/dist/GnuPG-Interface/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-GnuPG::Interface is a Perl module interface to interacting with GnuPG.
-~amd64 ~hppa ~ppc ~x86 ~ppc-macos
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/HTTP-DAV-0.38 b/metadata/cache/dev-perl/HTTP-DAV-0.38
deleted file mode 100644
index c29f796484d1..000000000000
--- a/metadata/cache/dev-perl/HTTP-DAV-0.38
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/libwww-perl dev-perl/XML-DOM dev-lang/perl[-build]
-dev-perl/libwww-perl dev-perl/XML-DOM dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/O/OP/OPERA/HTTP-DAV-0.38.tar.gz
-
-http://search.cpan.org/dist/HTTP-DAV/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A WebDAV client library for Perl5
-amd64 ~ppc x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/HTTP-DAV-0.460.0 b/metadata/cache/dev-perl/HTTP-DAV-0.460.0
deleted file mode 100644
index e52582098973..000000000000
--- a/metadata/cache/dev-perl/HTTP-DAV-0.460.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl[-build]
-dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.46.tar.gz
-
-http://search.cpan.org/dist/HTTP-DAV/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A WebDAV client library for Perl5
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/IO-Socket-INET6-2.63 b/metadata/cache/dev-perl/IO-Socket-INET6-2.63
deleted file mode 100644
index 05c0cfced8a4..000000000000
--- a/metadata/cache/dev-perl/IO-Socket-INET6-2.63
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/Socket6 virtual/perl-Module-Build dev-lang/perl[-build]
-dev-perl/Socket6 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.63.tar.gz
-
-http://search.cpan.org/dist/IO-Socket-INET6/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Work with IO sockets in ipv6
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/IO-Socket-INET6-2.670.0 b/metadata/cache/dev-perl/IO-Socket-INET6-2.670.0
deleted file mode 100644
index be21bd9e08da..000000000000
--- a/metadata/cache/dev-perl/IO-Socket-INET6-2.670.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/Socket6 virtual/perl-Module-Build dev-lang/perl[-build]
-dev-perl/Socket6 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.67.tar.gz
-
-http://search.cpan.org/dist/IO-Socket-INET6/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Work with IO sockets in ipv6
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/IPC-Signal-1.0.0 b/metadata/cache/dev-perl/IPC-Signal-1.0.0
index 2e4ce179ebc4..1b2c616aade8 100644
--- a/metadata/cache/dev-perl/IPC-Signal-1.0.0
+++ b/metadata/cache/dev-perl/IPC-Signal-1.0.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz
 http://search.cpan.org/dist/IPC-Signal/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Translate signal names to/from numbers
-amd64 ia64 ~ppc sparc x86
+amd64 ia64 ppc sparc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/JSON-2.27 b/metadata/cache/dev-perl/JSON-2.27
deleted file mode 100644
index 72d5f7a8f68f..000000000000
--- a/metadata/cache/dev-perl/JSON-2.27
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.27.tar.gz
-
-http://search.cpan.org/dist/JSON/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-parse and convert to JSON (JavaScript Object Notation)
-alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Mail-IMAPClient-3.25 b/metadata/cache/dev-perl/Mail-IMAPClient-3.25
deleted file mode 100644
index ff98c98cc47a..000000000000
--- a/metadata/cache/dev-perl/Mail-IMAPClient-3.25
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Parse-RecDescent-1.94 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
->=dev-perl/Parse-RecDescent-1.94 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.25.tar.gz
-
-http://search.cpan.org/dist/Mail-IMAPClient/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-IMAP client module for Perl
-alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Mail-IMAPClient-3.290.0 b/metadata/cache/dev-perl/Mail-IMAPClient-3.290.0
deleted file mode 100644
index 00f5f9f50c54..000000000000
--- a/metadata/cache/dev-perl/Mail-IMAPClient-3.290.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Parse-RecDescent-1.94 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
->=dev-perl/Parse-RecDescent-1.94 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.29.tar.gz
-
-http://search.cpan.org/dist/Mail-IMAPClient/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-IMAP client module for Perl
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Module-Refresh-0.13 b/metadata/cache/dev-perl/Module-Refresh-0.13
deleted file mode 100644
index d0c825067aa4..000000000000
--- a/metadata/cache/dev-perl/Module-Refresh-0.13
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl
-dev-lang/perl
-0
-mirror://cpan/authors/id/J/JE/JESSE/Module-Refresh-0.13.tar.gz
-
-http://search.cpan.org/dist/Module-Refresh/
-|| ( Artistic GPL-2 )
-Refresh %INC files when updated on disk
-amd64 ppc x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Module-Refresh-0.160.0 b/metadata/cache/dev-perl/Module-Refresh-0.160.0
deleted file mode 100644
index 6208dd7b6c0f..000000000000
--- a/metadata/cache/dev-perl/Module-Refresh-0.160.0
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( dev-perl/Path-Class ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/J/JE/JESSE/Module-Refresh-0.16.tar.gz
-
-http://search.cpan.org/dist/Module-Refresh/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Refresh %INC files when updated on disk
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Mouse-0.40 b/metadata/cache/dev-perl/Mouse-0.40
deleted file mode 100644
index 17a77e3d7a40..000000000000
--- a/metadata/cache/dev-perl/Mouse-0.40
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( dev-perl/Sub-Uplevel dev-perl/Test-Exception >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.40.tar.gz
-
-http://search.cpan.org/dist/Mouse/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Moose minus the antlers
-~amd64 hppa ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Mouse-0.930.0 b/metadata/cache/dev-perl/Mouse-0.930.0
deleted file mode 100644
index 02db58fb89e2..000000000000
--- a/metadata/cache/dev-perl/Mouse-0.930.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-ExtUtils-ParseXS-2.21 test? ( dev-perl/Sub-Uplevel >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
-virtual/perl-XSLoader dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.93.tar.gz mirror://gentoo/Mouse-0.64-ppport.h.bz2
-
-http://search.cpan.org/dist/Mouse/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Moose minus the antlers
-~amd64 ~hppa ~ppc ~x86 ~ppc-macos
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Net-CUPS-0.59 b/metadata/cache/dev-perl/Net-CUPS-0.59
deleted file mode 100644
index cde7620f3a2e..000000000000
--- a/metadata/cache/dev-perl/Net-CUPS-0.59
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-print/cups-1.1.21 dev-lang/perl test? ( virtual/perl-Test-Simple )
->=net-print/cups-1.1.21 dev-lang/perl
-0
-mirror://cpan/authors/id/D/DH/DHAGEMAN/Net-CUPS-0.59.tar.gz
-
-http://search.cpan.org/dist/Net-CUPS/
-|| ( Artistic GPL-2 )
-CUPS C API Interface
-amd64 x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/PDF-API2-0.57 b/metadata/cache/dev-perl/PDF-API2-0.57
deleted file mode 100644
index 5b787ad9c0a7..000000000000
--- a/metadata/cache/dev-perl/PDF-API2-0.57
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-IO-Compress dev-lang/perl
-virtual/perl-IO-Compress dev-lang/perl
-0
-mirror://cpan/authors/id/A/AR/AREIBENS/PDF-API2-0.57.tar.gz
-
-http://search.cpan.org/~areibens/
-|| ( Artistic LGPL-2 )
-A Perl Module Chain to faciliate the Creation and Modification of High-Quality "Portable Document Format (aka. PDF)" Files
-amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/PPI-1.212 b/metadata/cache/dev-perl/PPI-1.212
deleted file mode 100644
index 971a02d10a67..000000000000
--- a/metadata/cache/dev-perl/PPI-1.212
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-Scalar-List-Utils-1.20 >=dev-perl/Params-Util-1.00 >=dev-perl/Clone-0.30 >=virtual/perl-Digest-MD5-2.35 dev-perl/IO-String >=dev-perl/List-MoreUtils-0.16 >=virtual/perl-Storable-2.17 test? ( >=dev-perl/File-Remove-1.42 >=virtual/perl-Test-Simple-0.86 >=dev-perl/Test-NoWarnings-0.084 >=virtual/perl-File-Spec-0.84 dev-perl/Test-SubCalls dev-perl/Test-Object >=dev-perl/Class-Inspector-1.22 ) dev-lang/perl[-build]
->=virtual/perl-Scalar-List-Utils-1.20 >=dev-perl/Params-Util-1.00 >=dev-perl/Clone-0.30 >=virtual/perl-Digest-MD5-2.35 dev-perl/IO-String >=dev-perl/List-MoreUtils-0.16 >=virtual/perl-Storable-2.17 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.212.tar.gz
-
-http://search.cpan.org/dist/PPI/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Parse, Analyze and Manipulate Perl (without perl)
-amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Perl-Critic-1.106 b/metadata/cache/dev-perl/Perl-Critic-1.106
deleted file mode 100644
index c2297c7c001d..000000000000
--- a/metadata/cache/dev-perl/Perl-Critic-1.106
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.205 >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.205 >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.106.tar.gz
-
-http://search.cpan.org/dist/Perl-Critic/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Critique Perl source code for best-practices
-amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Perl-Critic-1.111 b/metadata/cache/dev-perl/Perl-Critic-1.111
deleted file mode 100644
index 490812f4419b..000000000000
--- a/metadata/cache/dev-perl/Perl-Critic-1.111
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.208 dev-perl/PPIx-Utilities >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.208 dev-perl/PPIx-Utilities >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.111.tar.gz
-
-http://search.cpan.org/dist/Perl-Critic/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Critique Perl source code for best-practices
-amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Perl-Critic-1.116.0 b/metadata/cache/dev-perl/Perl-Critic-1.116.0
deleted file mode 100644
index 7029b6500316..000000000000
--- a/metadata/cache/dev-perl/Perl-Critic-1.116.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/perltidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.19.0 dev-perl/Pod-Spell >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
->=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/perltidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.19.0 dev-perl/Pod-Spell >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.116.tar.gz
-
-http://search.cpan.org/dist/Perl-Critic/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Critique Perl source code for best-practices
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Proc-WaitStat-1.0.0 b/metadata/cache/dev-perl/Proc-WaitStat-1.0.0
index 834bd39526b7..90fba2cc2fa3 100644
--- a/metadata/cache/dev-perl/Proc-WaitStat-1.0.0
+++ b/metadata/cache/dev-perl/Proc-WaitStat-1.0.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
 http://search.cpan.org/dist/Proc-WaitStat/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Interpret and act on wait() status values
-amd64 ia64 ~ppc ~sparc x86
+amd64 ia64 ppc ~sparc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/SGMLSpm-1.03-r5 b/metadata/cache/dev-perl/SGMLSpm-1.03-r5
deleted file mode 100644
index 352d0e3224b6..000000000000
--- a/metadata/cache/dev-perl/SGMLSpm-1.03-r5
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4
->=dev-lang/perl-5.8.0-r12
-0
-mirror://cpan/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz
-
-http://search.cpan.org/author/DMEGG/SGMLSpm-1.03ii/
-GPL-2
-Perl library for parsing the output of nsgmls
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-
-
-
-
-
-
-
-install unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Statistics-Descriptive-3.0100 b/metadata/cache/dev-perl/Statistics-Descriptive-3.0100
deleted file mode 100644
index 9309d4333920..000000000000
--- a/metadata/cache/dev-perl/Statistics-Descriptive-3.0100
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0100.tar.gz
-
-http://search.cpan.org/dist/Statistics-Descriptive/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Module of basic descriptive statistical functions
-amd64 ~ppc x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Statistics-Descriptive-3.30.0 b/metadata/cache/dev-perl/Statistics-Descriptive-3.30.0
deleted file mode 100644
index 4f736015ab2f..000000000000
--- a/metadata/cache/dev-perl/Statistics-Descriptive-3.30.0
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0300.tar.gz
-
-http://search.cpan.org/dist/Statistics-Descriptive/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Module of basic descriptive statistical functions
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Statistics-Descriptive-3.50.0 b/metadata/cache/dev-perl/Statistics-Descriptive-3.50.0
deleted file mode 100644
index ff982ff6c1ac..000000000000
--- a/metadata/cache/dev-perl/Statistics-Descriptive-3.50.0
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0500.tar.gz
-
-http://search.cpan.org/dist/Statistics-Descriptive/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Module of basic descriptive statistical functions
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Statistics-Descriptive-3.60.100 b/metadata/cache/dev-perl/Statistics-Descriptive-3.60.100
deleted file mode 100644
index 9d4c2493cfec..000000000000
--- a/metadata/cache/dev-perl/Statistics-Descriptive-3.60.100
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0601.tar.gz
-
-http://search.cpan.org/dist/Statistics-Descriptive/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Module of basic descriptive statistical functions
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Statistics-Descriptive-3.60.200 b/metadata/cache/dev-perl/Statistics-Descriptive-3.60.200
deleted file mode 100644
index 03d5f3a14c7d..000000000000
--- a/metadata/cache/dev-perl/Statistics-Descriptive-3.60.200
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0602.tar.gz
-
-http://search.cpan.org/dist/Statistics-Descriptive/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Module of basic descriptive statistical functions
-~amd64 ~ppc ~x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Test-Fatal-0.003 b/metadata/cache/dev-perl/Test-Fatal-0.003
deleted file mode 100644
index 4f81b337f823..000000000000
--- a/metadata/cache/dev-perl/Test-Fatal-0.003
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Try-Tiny-0.07 >=virtual/perl-ExtUtils-MakeMaker-6.31 test? ( >=virtual/perl-Test-Simple-0.96 ) dev-lang/perl[-build]
->=dev-perl/Try-Tiny-0.07 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.003.tar.gz
-
-http://search.cpan.org/dist/Test-Fatal/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Incredibly simple helpers for testing code with exceptions
-~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Test-Fatal-0.10.0 b/metadata/cache/dev-perl/Test-Fatal-0.10.0
index 1a3b208fe28b..eb7d375d23e8 100644
--- a/metadata/cache/dev-perl/Test-Fatal-0.10.0
+++ b/metadata/cache/dev-perl/Test-Fatal-0.10.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz
 http://search.cpan.org/dist/Test-Fatal/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Incredibly simple helpers for testing code with exceptions
-~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Test-Fatal-0.6.0 b/metadata/cache/dev-perl/Test-Fatal-0.6.0
deleted file mode 100644
index d4e1397eee74..000000000000
--- a/metadata/cache/dev-perl/Test-Fatal-0.6.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
->=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.006.tar.gz
-
-http://search.cpan.org/dist/Test-Fatal/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Incredibly simple helpers for testing code with exceptions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Test-Fatal-0.8.0 b/metadata/cache/dev-perl/Test-Fatal-0.8.0
deleted file mode 100644
index 6cdde840567c..000000000000
--- a/metadata/cache/dev-perl/Test-Fatal-0.8.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
->=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.008.tar.gz
-
-http://search.cpan.org/dist/Test-Fatal/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Incredibly simple helpers for testing code with exceptions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/Test-Fatal-0.9.0 b/metadata/cache/dev-perl/Test-Fatal-0.9.0
deleted file mode 100644
index 94dd1ed4aa2a..000000000000
--- a/metadata/cache/dev-perl/Test-Fatal-0.9.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
->=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.009.tar.gz
-
-http://search.cpan.org/dist/Test-Fatal/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Incredibly simple helpers for testing code with exceptions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/WWW-Mechanize-1.66 b/metadata/cache/dev-perl/WWW-Mechanize-1.66
deleted file mode 100644
index cb11b613b0cf..000000000000
--- a/metadata/cache/dev-perl/WWW-Mechanize-1.66
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle ) dev-lang/perl[-build]
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/P/PE/PETDANCE/WWW-Mechanize-1.66.tar.gz
-
-http://search.cpan.org/dist/WWW-Mechanize/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Handy web browsing in a Perl object
-amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/WWW-Mechanize-1.700.0 b/metadata/cache/dev-perl/WWW-Mechanize-1.700.0
deleted file mode 100644
index 342a5b4ce0c9..000000000000
--- a/metadata/cache/dev-perl/WWW-Mechanize-1.700.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle dev-perl/HTTP-Server-Simple ) dev-lang/perl[-build]
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.70.tar.gz
-
-http://search.cpan.org/dist/WWW-Mechanize/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Handy web browsing in a Perl object
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/WWW-Mechanize-1.710.0 b/metadata/cache/dev-perl/WWW-Mechanize-1.710.0
deleted file mode 100644
index 0ef3e151826f..000000000000
--- a/metadata/cache/dev-perl/WWW-Mechanize-1.710.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle dev-perl/HTTP-Server-Simple ) dev-lang/perl[-build]
-dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.71.tar.gz
-
-http://search.cpan.org/dist/WWW-Mechanize/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-Handy web browsing in a Perl object
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-base eutils multilib perl-module toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/XML-Parser-2.36-r1 b/metadata/cache/dev-perl/XML-Parser-2.36-r1
deleted file mode 100644
index 447f717e3c59..000000000000
--- a/metadata/cache/dev-perl/XML-Parser-2.36-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/expat-1.95.1-r1 dev-lang/perl
->=dev-libs/expat-1.95.1-r1 dev-lang/perl
-0
-mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
-
-http://search.cpan.org/dist/XML-Parser/
-|| ( Artistic GPL-1 GPL-2 GPL-3 )
-A Perl extension interface to James Clark's XML parser, expat
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.223 b/metadata/cache/dev-perl/glib-perl-1.223
deleted file mode 100644
index d18d6b71076b..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.223
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/Glib-1.223.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.224.0 b/metadata/cache/dev-perl/glib-perl-1.224.0
deleted file mode 100644
index 9fdc7c0d66de..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.224.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/Glib-1.224.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.240.0 b/metadata/cache/dev-perl/glib-perl-1.240.0
deleted file mode 100644
index d7af05bdddc5..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.240.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/T/TS/TSCH/Glib-1.240.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.241.0 b/metadata/cache/dev-perl/glib-perl-1.241.0
deleted file mode 100644
index 468c55189ed3..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.241.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/X/XA/XAOC/Glib-1.241.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.250.0 b/metadata/cache/dev-perl/glib-perl-1.250.0
deleted file mode 100644
index 0d1226705087..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.250.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/X/XA/XAOC/Glib-1.250.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/glib-perl-1.251.0 b/metadata/cache/dev-perl/glib-perl-1.251.0
deleted file mode 100644
index f8a482a13445..000000000000
--- a/metadata/cache/dev-perl/glib-perl-1.251.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
->=dev-libs/glib-2 dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/X/XA/XAOC/Glib-1.251.tar.gz
-
-http://gtk2-perl.sf.net/
-LGPL-2.1
-Glib - Perl wrappers for the GLib utility and Object libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/libintl-perl-1.16 b/metadata/cache/dev-perl/libintl-perl-1.16
deleted file mode 100644
index 52e8a4e7be2f..000000000000
--- a/metadata/cache/dev-perl/libintl-perl-1.16
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl
-dev-lang/perl
-0
-mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.16.tar.gz
-
-http://search.cpan.org/~guido/
-LGPL-2.1
-Perl internationalization library that aims to be compatible with the Uniforum message translations system
-amd64 ia64 ppc ppc64 sparc x86
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/mime-construct-1.900.0 b/metadata/cache/dev-perl/mime-construct-1.900.0
index 08a59abdead2..36a15a47539f 100644
--- a/metadata/cache/dev-perl/mime-construct-1.900.0
+++ b/metadata/cache/dev-perl/mime-construct-1.900.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.9.tar.gz
 http://search.cpan.org/dist/mime-construct/
 || ( GPL-2 GPL-3 )
 construct and optionally mail MIME messages
-amd64 ia64 ~ppc ~sparc x86
+amd64 ia64 ppc ~sparc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/regexp-common-2010010201 b/metadata/cache/dev-perl/regexp-common-2010010201
deleted file mode 100644
index 71ea945127a3..000000000000
--- a/metadata/cache/dev-perl/regexp-common-2010010201
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2010010201.tar.gz
-
-http://search.cpan.org/dist/Regexp-Common/
-|| ( Artistic Artistic-2 MIT BSD )
-Provide commonly requested regular expressions
-alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-perl/regexp-common-2011041701.0.0 b/metadata/cache/dev-perl/regexp-common-2011041701.0.0
deleted file mode 100644
index 408dc50834a5..000000000000
--- a/metadata/cache/dev-perl/regexp-common-2011041701.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl[-build]
-dev-lang/perl[-build]
-0
-mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2011041701.tar.gz
-
-http://search.cpan.org/dist/Regexp-Common/
-|| ( Artistic Artistic-2 MIT BSD )
-Provide commonly requested regular expressions
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-base eutils multilib perl-module toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/numpy-1.6.1-r1 b/metadata/cache/dev-python/numpy-1.6.1-r1
index 6cc4833cbe32..061af2f72a97 100644
--- a/metadata/cache/dev-python/numpy-1.6.1-r1
+++ b/metadata/cache/dev-python/numpy-1.6.1-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/numpy/numpy-1.6.1.tar.gz doc? ( http://docs.scipy.org/doc/n
 http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy
 BSD
 Fast array and numerical python library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 distutils eutils flag-o-matic fortran-2 multilib python toolchain-funcs user versionator
 doc lapack test
 
diff --git a/metadata/cache/dev-python/pycrypto-2.6 b/metadata/cache/dev-python/pycrypto-2.6
index 113e751851a9..5f1796f9557e 100644
--- a/metadata/cache/dev-python/pycrypto-2.6
+++ b/metadata/cache/dev-python/pycrypto-2.6
@@ -6,7 +6,7 @@ http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto
 PSF-2 public-domain
 Python Cryptography Toolkit
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 distutils multilib python toolchain-funcs
 doc +gmp
 
diff --git a/metadata/cache/dev-python/pytz-2012c b/metadata/cache/dev-python/pytz-2012c
index 0b700a751955..2a3272aa0bbc 100644
--- a/metadata/cache/dev-python/pytz-2012c
+++ b/metadata/cache/dev-python/pytz-2012c
@@ -6,7 +6,7 @@ mirror://pypi/p/pytz/pytz-2012c.tar.bz2
 http://pypi.python.org/pypi/pytz http://pytz.sourceforge.net/
 MIT
 World timezone definitions for Python
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 distutils eutils multilib python toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-ruby/kramdown-0.13.7 b/metadata/cache/dev-ruby/kramdown-0.13.7
new file mode 100644
index 000000000000..c60d218cd177
--- /dev/null
+++ b/metadata/cache/dev-ruby/kramdown-0.13.7
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/kramdown-0.13.7.gem
+
+http://kramdown.rubyforge.org/
+GPL-3
+yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition.
+~amd64 ~x86
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+latex elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-tcltk/expect-lite-4.3.0 b/metadata/cache/dev-tcltk/expect-lite-4.3.0
index 9cdac8998049..1b5479149513 100644
--- a/metadata/cache/dev-tcltk/expect-lite-4.3.0
+++ b/metadata/cache/dev-tcltk/expect-lite-4.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/expect-lite/expect-lite_4.3.0.tar.gz
 http://expect-lite.sourceforge.net/
 BSD
 quick and easy command line automation tool built on top of expect
-~amd64 ~x86
+amd64 ~x86
 
 debug examples
 
diff --git a/metadata/cache/dev-util/boost-build-1.48.0-r1 b/metadata/cache/dev-util/boost-build-1.48.0-r1
index 6d253d1a5420..7a3cd3806872 100644
--- a/metadata/cache/dev-util/boost-build-1.48.0-r1
+++ b/metadata/cache/dev-util/boost-build-1.48.0-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/boost/boost_1_48_0.tar.bz2
 http://www.boost.org/doc/tools/build/index.html
 Boost-1.0
 A system for large project software construction, which is simple to use and powerful.
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 eutils flag-o-matic multilib python toolchain-funcs user versionator
 examples python
 
diff --git a/metadata/cache/dev-util/ccache-3.1.7 b/metadata/cache/dev-util/ccache-3.1.7
index a288b2016527..af5b6627bb6f 100644
--- a/metadata/cache/dev-util/ccache-3.1.7
+++ b/metadata/cache/dev-util/ccache-3.1.7
@@ -6,7 +6,7 @@ http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz
 http://ccache.samba.org/
 GPL-3
 fast compiler cache
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/dev-util/eric-4.5.0 b/metadata/cache/dev-util/eric-4.5.0
deleted file mode 100644
index 9b450192092f..000000000000
--- a/metadata/cache/dev-util/eric-4.5.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-4
-mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-4.5.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-cs-4.5.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-de-4.5.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-en-4.5.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-es-4.5.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-fr-4.5.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-it-4.5.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-ru-4.5.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-tr-4.5.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 x86
-eutils multilib python toolchain-funcs user
-kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-4
-
-install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/dev-util/eric-4.5.3 b/metadata/cache/dev-util/eric-4.5.3
index ba07e3d14b1c..794404cc58af 100644
--- a/metadata/cache/dev-util/eric-4.5.3
+++ b/metadata/cache/dev-util/eric-4.5.3
@@ -6,7 +6,7 @@ mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-4.5.3.tar.gz linguas_cs?
 http://eric-ide.python-projects.org/
 GPL-3
 A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
 eutils multilib python toolchain-funcs user
 kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
 
diff --git a/metadata/cache/dev-util/eric-5.2.0 b/metadata/cache/dev-util/eric-5.2.0
deleted file mode 100644
index 43d6e53c5c88..000000000000
--- a/metadata/cache/dev-util/eric-5.2.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
-5
-mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-5.2.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-cs-5.2.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-de-5.2.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-en-5.2.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-es-5.2.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-fr-5.2.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-it-5.2.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-ru-5.2.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-tr-5.2.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 x86
-eutils multilib python toolchain-funcs user
-spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-4
-
-install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/dev-util/eric-5.2.2 b/metadata/cache/dev-util/eric-5.2.2
index 26d462720602..d0959bde5c30 100644
--- a/metadata/cache/dev-util/eric-5.2.2
+++ b/metadata/cache/dev-util/eric-5.2.2
@@ -6,7 +6,7 @@ mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-5.2.2.tar.gz linguas_cs?
 http://eric-ide.python-projects.org/
 GPL-3
 A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
 eutils multilib python toolchain-funcs user
 spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
 
diff --git a/metadata/cache/java-virtuals/jmx-1.0-r3 b/metadata/cache/java-virtuals/jmx-1.0-r3
index bbb278c10fdc..8738ddad066c 100644
--- a/metadata/cache/java-virtuals/jmx-1.0-r3
+++ b/metadata/cache/java-virtuals/jmx-1.0-r3
@@ -6,7 +6,7 @@
 http://www.gentoo.org
 GPL-2
 Virtual for Java Management Extensions (JMX)
-~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils java-utils-2 java-virtuals-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD
 
diff --git a/metadata/cache/media-gfx/icoutils-0.29.1-r2 b/metadata/cache/media-gfx/icoutils-0.29.1-r2
new file mode 100644
index 000000000000..9a37bda94db3
--- /dev/null
+++ b/metadata/cache/media-gfx/icoutils-0.29.1-r2
@@ -0,0 +1,22 @@
+media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64
+0
+http://savannah.nongnu.org/download/icoutils/icoutils-0.29.1.tar.bz2
+
+http://www.nongnu.org/icoutils/
+GPL-2
+A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur).
+~amd64 ~ppc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+nls
+
+
+
+2
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libjpeg-turbo-1.2.0-r2 b/metadata/cache/media-libs/libjpeg-turbo-1.2.0-r2
index b3683e3237ce..2a8072fb4612 100644
--- a/metadata/cache/media-libs/libjpeg-turbo-1.2.0-r2
+++ b/metadata/cache/media-libs/libjpeg-turbo-1.2.0-r2
@@ -1,4 +1,4 @@
-!media-libs/jpeg:0 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+!media-libs/jpeg:0 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 !media-libs/jpeg:0 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.2.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
diff --git a/metadata/cache/media-plugins/vdr-live-0.2.0.20110419-r1 b/metadata/cache/media-plugins/vdr-live-0.2.0.20110419-r1
deleted file mode 100644
index bfa523edb01f..000000000000
--- a/metadata/cache/media-plugins/vdr-live-0.2.0.20110419-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
-media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-mirror://gentoo/vdr-live-0.2.0.20110419.tar.gz
-
-http://live.vdr-developer.org
-GPL-2
-VDR Plugin: Web Access To Settings
-~amd64 ~x86
-base eutils flag-o-matic multilib ssl-cert toolchain-funcs user vdr-plugin
-ssl ssl
-
-
-
-3
-
-compile config configure install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-live-0.2.0.20120114-r1 b/metadata/cache/media-plugins/vdr-live-0.2.0_p20120325
similarity index 52%
rename from metadata/cache/media-plugins/vdr-live-0.2.0.20120114-r1
rename to metadata/cache/media-plugins/vdr-live-0.2.0_p20120325
index c67fc919b585..4f2302808c6b 100644
--- a/metadata/cache/media-plugins/vdr-live-0.2.0.20120114-r1
+++ b/metadata/cache/media-plugins/vdr-live-0.2.0_p20120325
@@ -1,14 +1,14 @@
-media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
-media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
+media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 0
-mirror://gentoo/vdr-live-0.2.0.20120114.tar.gz
+mirror://gentoo/vdr-live-0.2.0_p20120325.tar.bz2
 
 http://live.vdr-developer.org
 GPL-2
 VDR Plugin: Web Access To Settings
 ~amd64 ~x86
-base eutils flag-o-matic multilib ssl-cert toolchain-funcs user vdr-plugin
-ssl ssl
+base eutils flag-o-matic multilib ssl-cert toolchain-funcs user vdr-plugin-2
+pcre ssl ssl
 
 
 
diff --git a/metadata/cache/media-sound/asunder-2.2 b/metadata/cache/media-sound/asunder-2.2
index 17b0498d0104..54663ac167f7 100644
--- a/metadata/cache/media-sound/asunder-2.2
+++ b/metadata/cache/media-sound/asunder-2.2
@@ -6,7 +6,7 @@ http://littlesvr.ca/asunder/releases/asunder-2.2.tar.bz2
 http://littlesvr.ca/asunder/
 GPL-2
 A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis and FLAC
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 
 flac mp3 vorbis wavpack
 
diff --git a/metadata/cache/media-sound/mixxx-1.10.0 b/metadata/cache/media-sound/mixxx-1.10.0
index 55ec80f5c53f..9e34f511dc93 100644
--- a/metadata/cache/media-sound/mixxx-1.10.0
+++ b/metadata/cache/media-sound/mixxx-1.10.0
@@ -1,5 +1,5 @@
-media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig dev-util/scons
-media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack )
+media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig dev-util/scons
+media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack )
 0
 http://downloads.mixxx.org/mixxx-1.10.0/mixxx-1.10.0-src.tar.gz
 
diff --git a/metadata/cache/media-sound/rhythmbox-2.95 b/metadata/cache/media-sound/rhythmbox-2.95
index 87523cc94d0e..d50e04f76636 100644
--- a/metadata/cache/media-sound/rhythmbox-2.95
+++ b/metadata/cache/media-sound/rhythmbox-2.95
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
 0
 mirror://gnome/sources/rhythmbox/2.95/rhythmbox-2.95.tar.xz
 
diff --git a/metadata/cache/media-sound/rhythmbox-2.96 b/metadata/cache/media-sound/rhythmbox-2.96
index 2f9bed5523aa..aea3fe28343b 100644
--- a/metadata/cache/media-sound/rhythmbox-2.96
+++ b/metadata/cache/media-sound/rhythmbox-2.96
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
 0
 mirror://gnome/sources/rhythmbox/2.96/rhythmbox-2.96.tar.xz
 
diff --git a/metadata/cache/media-sound/wildmidi-0.2.3.5 b/metadata/cache/media-sound/wildmidi-0.2.3.5
index 58bc357e85e8..514c55e1781d 100644
--- a/metadata/cache/media-sound/wildmidi-0.2.3.5
+++ b/metadata/cache/media-sound/wildmidi-0.2.3.5
@@ -6,7 +6,7 @@ mirror://sourceforge/wildmidi/wildmidi-0.2.3.5.tar.gz
 http://wildmidi.sourceforge.net/
 GPL-3 LGPL-3
 Midi processing library and a midi player using the gus patch set
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 autotools base eutils libtool multilib toolchain-funcs user
 alsa debug
 
diff --git a/metadata/cache/media-video/2mandvd-1.8.1 b/metadata/cache/media-video/2mandvd-1.8.1
new file mode 100644
index 000000000000..e20e32824a91
--- /dev/null
+++ b/metadata/cache/media-video/2mandvd-1.8.1
@@ -0,0 +1,22 @@
+media-libs/libsdl virtual/ffmpeg virtual/glu virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4
+media-libs/libsdl virtual/ffmpeg virtual/glu virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 || ( app-cdr/cdrkit app-cdr/cdrtools ) dev-lang/perl media-fonts/dejavu media-gfx/exif media-libs/netpbm media-sound/sox media-video/dvdauthor media-video/ffmpegthumbnailer media-video/mjpegtools media-video/mplayer[encode]
+0
+http://download.tuxfamily.org/2mandvd/2mandvd-1.8.1.tar.gz
+
+http://kde-apps.org/content/show.php?content=99450
+GPL-3
+The successor of ManDVD
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+debug linguas_cs linguas_de linguas_en linguas_it linguas_ru
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/media-video/mkvtoolnix-5.6.0 b/metadata/cache/media-video/mkvtoolnix-5.6.0
index 00c0c02e5560..42b168f8b98f 100644
--- a/metadata/cache/media-video/mkvtoolnix-5.6.0
+++ b/metadata/cache/media-video/mkvtoolnix-5.6.0
@@ -7,14 +7,14 @@ http://www.bunkus.org/videotools/mkvtoolnix
 GPL-2
 Tools to create, alter, and inspect Matroska files
 ~amd64 ~x86
-eutils multilib toolchain-funcs user wxwidgets
+eutils multilib toolchain-funcs user versionator wxwidgets
 bzip2 debug lzo pch qt4 wxwidgets
 
 
 
 4
 
-compile configure install prepare
+compile configure install prepare setup
 
 
 
diff --git a/metadata/cache/media-video/mpeg-tools-1.5b-r4 b/metadata/cache/media-video/mpeg-tools-1.5b-r4
index 02ee49150662..899dcf23f06c 100644
--- a/metadata/cache/media-video/mpeg-tools-1.5b-r4
+++ b/metadata/cache/media-video/mpeg-tools-1.5b-r4
@@ -6,7 +6,7 @@ ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar
 http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html
 BSD
 Tools for MPEG video
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-analyzer/arpon-2.7-r1 b/metadata/cache/net-analyzer/arpon-2.7-r1
index 7e1c026e8cb8..f7c65b1db091 100644
--- a/metadata/cache/net-analyzer/arpon-2.7-r1
+++ b/metadata/cache/net-analyzer/arpon-2.7-r1
@@ -6,13 +6,13 @@ mirror://sourceforge/arpon/ArpON-2.7.tar.gz
 http://arpon.sourceforge.net/
 BSD
 ArpON (Arp handler inspectiON) is a portable Arp handler.
-~amd64 ~x86
+amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 
 
 
 
-2
+4
 
 compile configure install postinst prepare test unpack
 
diff --git a/metadata/cache/net-analyzer/gspoof-3.2-r2 b/metadata/cache/net-analyzer/gspoof-3.2-r2
index bcc37f2e629c..26eadd1c8ad5 100644
--- a/metadata/cache/net-analyzer/gspoof-3.2-r2
+++ b/metadata/cache/net-analyzer/gspoof-3.2-r2
@@ -6,7 +6,7 @@ http://gspoof.sourceforge.net/src/gspoof-3.2.tar.gz
 http://gspoof.sourceforge.net/
 GPL-2
 A simple GTK/command line TCP/IP packet generator
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 autotools eutils libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-analyzer/nagstamon-0.9.9 b/metadata/cache/net-analyzer/nagstamon-0.9.9
index 618bc966a5cc..a080c8cbf837 100644
--- a/metadata/cache/net-analyzer/nagstamon-0.9.9
+++ b/metadata/cache/net-analyzer/nagstamon-0.9.9
@@ -6,7 +6,7 @@ mirror://sourceforge/nagstamon/nagstamon_0.9.9.tar.gz
 http://nagstamon.sourceforge.net
 GPL-2
 Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box
-~amd64 ~x86
+amd64 ~x86
 eutils multilib python toolchain-funcs user
 gnome sound
 
diff --git a/metadata/cache/net-analyzer/tcpflow-1.2.7 b/metadata/cache/net-analyzer/tcpflow-1.2.7
new file mode 100644
index 000000000000..0d40b1b0d705
--- /dev/null
+++ b/metadata/cache/net-analyzer/tcpflow-1.2.7
@@ -0,0 +1,22 @@
+net-libs/libpcap sys-libs/zlib test? ( sys-apps/coreutils )
+net-libs/libpcap sys-libs/zlib
+0
+mirror://github/simsong/tcpflow/tcpflow-1.2.7.tar.gz
+
+https://github.com/simsong/tcpflow
+GPL-3
+A tool for monitoring, capturing and storing TCP connections flows
+~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+
+test
+
+
+
+4
+
+prepare
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1 b/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
index 239e8574628c..04d281e9ac2f 100644
--- a/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
+++ b/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/fwbuilder/fwbuilder-5.0.1.3592.tar.gz
 http://www.fwbuilder.org/
 GPL-2
 A firewall GUI
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 autotools base eutils libtool multilib qt4-r2 toolchain-funcs user
 
 
diff --git a/metadata/cache/net-ftp/frox-0.7.18-r4 b/metadata/cache/net-ftp/frox-0.7.18-r4
index 01e50bec40b9..61dcf8d203b0 100644
--- a/metadata/cache/net-ftp/frox-0.7.18-r4
+++ b/metadata/cache/net-ftp/frox-0.7.18-r4
@@ -6,7 +6,7 @@ http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
 http://frox.sourceforge.net/
 GPL-2
 A transparent ftp proxy
-~amd64 ~ppc ~sparc ~x86
+amd64 ~ppc ~sparc ~x86
 autotools eutils libtool multilib toolchain-funcs user
 clamav ssl transparent
 
diff --git a/metadata/cache/net-ftp/ncftp-3.2.5-r1 b/metadata/cache/net-ftp/ncftp-3.2.5-r1
index 8c02e71955c1..9c147b5a5005 100644
--- a/metadata/cache/net-ftp/ncftp-3.2.5-r1
+++ b/metadata/cache/net-ftp/ncftp-3.2.5-r1
@@ -6,7 +6,7 @@ ftp://ftp.ncftp.com/ncftp/ncftp-3.2.5-src.tar.bz2 -> ncftp-3.2.5.474.tar.bz2
 http://www.ncftp.com/
 Clarified-Artistic
 An extremely configurable ftp client
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 pch
 
diff --git a/metadata/cache/net-im/emesene-1.6.3-r1 b/metadata/cache/net-im/emesene-1.6.3-r1
deleted file mode 100644
index 0ac378ecd2bb..000000000000
--- a/metadata/cache/net-im/emesene-1.6.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-lang/python-2*
-dev-python/pygtk:2 webcam? ( media-plugins/gst-plugins-meta[v4l] dev-python/gst-python media-libs/libmimic ) =dev-lang/python-2*
-0
-mirror://sourceforge/emesene/emesene-1.6.3.tar.gz
-
-http://www.emesene.org
-GPL-2
-Platform independent MSN Messenger client written in Python+GTK
-amd64 x86
-eutils multilib python toolchain-funcs user
-webcam
-
-
-
-2
-
-compile install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-im/pidgin-2.10.4 b/metadata/cache/net-im/pidgin-2.10.4
index 81c0475012fd..f233053f46d7 100644
--- a/metadata/cache/net-im/pidgin-2.10.4
+++ b/metadata/cache/net-im/pidgin-2.10.4
@@ -6,7 +6,7 @@ mirror://sourceforge/pidgin/pidgin-2.10.4.tar.bz2
 http://pidgin.im/
 GPL-2
 GTK Instant Messenger client
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 base eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib perl-app perl-module python toolchain-funcs user versionator
 dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug
 
diff --git a/metadata/cache/net-im/qtwitter-0.10.0-r1 b/metadata/cache/net-im/qtwitter-0.10.0-r1
index 9309df1220a3..d3b4c1a7822c 100644
--- a/metadata/cache/net-im/qtwitter-0.10.0-r1
+++ b/metadata/cache/net-im/qtwitter-0.10.0-r1
@@ -6,7 +6,7 @@ http://files.ayoy.net/qtwitter/release/0.10.0/src/qtwitter-0.10.0-src.tar.gz
 http://www.qt-apps.org/content/show.php/qTwitter?content=99087
 LGPL-2.1
 A Qt-based microblogging client
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib qt4-r2 toolchain-funcs user
 debug linguas_nb_NO linguas_pt_BR linguas_ca linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_pl
 
diff --git a/metadata/cache/net-libs/aqbanking-5.0.24.0 b/metadata/cache/net-libs/aqbanking-5.0.24.0
new file mode 100644
index 000000000000..c06d81de09eb
--- /dev/null
+++ b/metadata/cache/net-libs/aqbanking-5.0.24.0
@@ -0,0 +1,22 @@
+>=app-misc/ktoblzcheck-1.37 >=dev-libs/gmp-5 >=sys-libs/gwenhywfar-4.3.3[gtk?] virtual/libintl ofx? ( >=dev-libs/libofx-0.9.4 ) chipcard? ( >=sys-libs/libchipcard-5.0.2 ) virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen )
+>=app-misc/ktoblzcheck-1.37 >=dev-libs/gmp-5 >=sys-libs/gwenhywfar-4.3.3[gtk?] virtual/libintl ofx? ( >=dev-libs/libofx-0.9.4 ) chipcard? ( >=sys-libs/libchipcard-5.0.2 )
+0
+http://www.aquamaniac.de/sites/download/download.php?package=03&release=94&file=01&dummy=aqbanking-5.0.24.0-git.tar.gz -> aqbanking-5.0.24.0-git.tar.gz
+
+http://www.aquamaniac.de/aqbanking/
+GPL-2
+Generic Online Banking Interface
+~amd64 ~ppc ~ppc64 ~sparc ~x86
+
+chipcard debug doc examples gtk ofx
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/net-libs/libnet-1.0.2a-r4 b/metadata/cache/net-libs/libnet-1.0.2a-r4
index 684576ed11a6..d5b42d1fc019 100644
--- a/metadata/cache/net-libs/libnet-1.0.2a-r4
+++ b/metadata/cache/net-libs/libnet-1.0.2a-r4
@@ -6,7 +6,7 @@ http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
 http://www.packetfactory.net/libnet/
 LGPL-2
 library to provide an API for commonly used low-level network functions (mainly packet injection)
-~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-libs/libvncserver-0.9.8.2-r2 b/metadata/cache/net-libs/libvncserver-0.9.8.2-r2
index 57a8b29dd50e..e23625e1ca8f 100644
--- a/metadata/cache/net-libs/libvncserver-0.9.8.2-r2
+++ b/metadata/cache/net-libs/libvncserver-0.9.8.2-r2
@@ -6,7 +6,7 @@ http://libvncserver.sourceforge.net/LibVNCServer-0.9.8.2.tar.gz mirror://sourcef
 http://libvncserver.sourceforge.net/
 GPL-2
 library for creating vnc servers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 eutils libtool multilib toolchain-funcs user
 no24bpp crypt gnutls ipv6 +jpeg test threads +zlib
 
diff --git a/metadata/cache/net-libs/openslp-1.2.1-r2 b/metadata/cache/net-libs/openslp-1.2.1-r2
index 51a3496d3fe6..9f9fad92f71f 100644
--- a/metadata/cache/net-libs/openslp-1.2.1-r2
+++ b/metadata/cache/net-libs/openslp-1.2.1-r2
@@ -6,7 +6,7 @@ test
 http://www.openslp.org/
 BSD
 An open-source implementation of Service Location Protocol
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools eutils libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-misc/bfgminer-2.4.2 b/metadata/cache/net-misc/bfgminer-2.4.2
new file mode 100644
index 000000000000..ffea78720296
--- /dev/null
+++ b/metadata/cache/net-misc/bfgminer-2.4.2
@@ -0,0 +1,22 @@
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) opencl? ( virtual/opencl ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 )
+0
+http://luke.dashjr.org/programs/bitcoin/files/bfgminer/2.4.2/bfgminer-2.4.2.tbz2
+
+https://bitcointalk.org/index.php?topic=78192.0
+GPL-3
+Modular Bitcoin CPU/GPU/FPGA miner in C
+~x86 ~amd64
+eutils multilib toolchain-funcs user
++adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/cgminer-2.4.2 b/metadata/cache/net-misc/cgminer-2.4.2
new file mode 100644
index 000000000000..3dbbd63f904a
--- /dev/null
+++ b/metadata/cache/net-misc/cgminer-2.4.2
@@ -0,0 +1,22 @@
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 )
+0
+http://ck.kolivas.org/apps/cgminer/cgminer-2.4.2.tar.bz2
+
+https://bitcointalk.org/index.php?topic=28402.0
+GPL-3
+Bitcoin CPU/GPU/FPGA miner in C
+~x86 ~amd64
+eutils multilib toolchain-funcs user versionator
++adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/efax-0.9a-r3 b/metadata/cache/net-misc/efax-0.9a-r3
index 01d63e8623e1..1e6638abe4d7 100644
--- a/metadata/cache/net-misc/efax-0.9a-r3
+++ b/metadata/cache/net-misc/efax-0.9a-r3
@@ -6,7 +6,7 @@ http://www.cce.com/efax/download/efax-0.9a-001114.tar.gz mirror://debian/pool/ma
 http://gentoo.org
 GPL-2
 A simple fax program for single-user systems
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-misc/miniupnpd-1.6 b/metadata/cache/net-misc/miniupnpd-1.6
deleted file mode 100644
index dac151b65e79..000000000000
--- a/metadata/cache/net-misc/miniupnpd-1.6
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.4.6 sys-apps/lsb-release >=sys-kernel/linux-headers-2.6.31 sys-apps/util-linux
->=net-firewall/iptables-1.4.6 sys-apps/lsb-release >=sys-kernel/linux-headers-2.6.31
-0
-http://miniupnp.free.fr/files/miniupnpd-1.6.tar.gz
-
-http://miniupnp.free.fr/
-BSD
-MiniUPnP IGD Daemon
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/miniupnpd-1.7_pre20120509 b/metadata/cache/net-misc/miniupnpd-1.7
similarity index 80%
rename from metadata/cache/net-misc/miniupnpd-1.7_pre20120509
rename to metadata/cache/net-misc/miniupnpd-1.7
index 3d404543ffa0..913c63fb273c 100644
--- a/metadata/cache/net-misc/miniupnpd-1.7_pre20120509
+++ b/metadata/cache/net-misc/miniupnpd-1.7
@@ -1,7 +1,7 @@
 >=net-firewall/iptables-1.4.6 sys-apps/util-linux sys-apps/lsb-release
 >=net-firewall/iptables-1.4.6
 0
-http://miniupnp.free.fr/files/miniupnpd-1.6.20120509.tar.gz
+http://miniupnp.free.fr/files/miniupnpd-1.7.tar.gz
 
 http://miniupnp.free.fr/
 BSD
diff --git a/metadata/cache/net-misc/radvd-1.8.5-r1 b/metadata/cache/net-misc/radvd-1.8.5-r1
index 236b1568aa34..595a97e5d1b0 100644
--- a/metadata/cache/net-misc/radvd-1.8.5-r1
+++ b/metadata/cache/net-misc/radvd-1.8.5-r1
@@ -6,7 +6,7 @@ http://v6web.litech.org/radvd/dist/radvd-1.8.5.tar.gz
 http://v6web.litech.org/radvd/
 BSD
 Linux IPv6 Router Advertisement Daemon
-amd64 ~arm ~hppa ppc ~sparc x86 ~x86-fbsd
+amd64 arm ~hppa ppc ~sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 kernel_FreeBSD selinux
 
diff --git a/metadata/cache/net-misc/sobby-0.4.8 b/metadata/cache/net-misc/sobby-0.4.8
index 0fe9a9bf5c4e..c06c7edd5de1 100644
--- a/metadata/cache/net-misc/sobby-0.4.8
+++ b/metadata/cache/net-misc/sobby-0.4.8
@@ -6,7 +6,7 @@ http://releases.0x539.de/sobby/sobby-0.4.8.tar.gz
 http://gobby.0x539.de/
 GPL-2
 Standalone Obby server
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils multilib toolchain-funcs user
 avahi
 
diff --git a/metadata/cache/net-misc/tigervnc-1.1.0-r6 b/metadata/cache/net-misc/tigervnc-1.1.0-r6
new file mode 100644
index 000000000000..4e4114b7d9ac
--- /dev/null
+++ b/metadata/cache/net-misc/tigervnc-1.1.0-r6
@@ -0,0 +1,22 @@
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
+0
+mirror://sourceforge/tigervnc/tigervnc-1.1.0.tar.gz mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.11.4.tar.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )
+
+http://www.tigervnc.org
+GPL-2
+Remote desktop viewer display system
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+nptl +opengl server +xorgmodule
+
+
+
+1
+
+compile install postinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/tigervnc-1.1.0-r7 b/metadata/cache/net-misc/tigervnc-1.1.0-r7
new file mode 100644
index 000000000000..0f9fc3287ff2
--- /dev/null
+++ b/metadata/cache/net-misc/tigervnc-1.1.0-r7
@@ -0,0 +1,22 @@
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.12.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.12.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
+0
+mirror://sourceforge/tigervnc/tigervnc-1.1.0.tar.gz mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.12.2.tar.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )
+
+http://www.tigervnc.org
+GPL-2
+Remote desktop viewer display system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+nptl +opengl server +xorgmodule
+
+
+
+1
+
+compile install postinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/vtun-3.0.2-r1 b/metadata/cache/net-misc/vtun-3.0.2-r1
index ae1b0eb3f4e6..503625f3ea7b 100644
--- a/metadata/cache/net-misc/vtun-3.0.2-r1
+++ b/metadata/cache/net-misc/vtun-3.0.2-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
 http://vtun.sourceforge.net/
 GPL-2
 Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression.
-~alpha ~amd64 ~ppc ~sparc ~x86
+~alpha amd64 ~ppc ~sparc ~x86
 eutils multilib toolchain-funcs user
 lzo socks5 ssl zlib
 
diff --git a/metadata/cache/net-p2p/amule-2.2.6 b/metadata/cache/net-p2p/amule-2.2.6
deleted file mode 100644
index e0cc99fba7c1..000000000000
--- a/metadata/cache/net-p2p/amule-2.2.6
+++ /dev/null
@@ -1,22 +0,0 @@
-=x11-libs/wxGTK-2.8* >=dev-libs/crypto++-5 >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0 unicode? ( >=media-libs/gd-2.0.26 ) )
-=x11-libs/wxGTK-2.8* >=dev-libs/crypto++-5 >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0 unicode? ( >=media-libs/gd-2.0.26 ) )
-0
-mirror://sourceforge/amule/aMule-2.2.6.tar.bz2
-
-http://www.amule.org/
-GPL-2
-aMule, the all-platform eMule p2p client
-alpha amd64 ppc ppc64 ~sparc x86
-eutils flag-o-matic multilib toolchain-funcs user wxwidgets
-daemon debug geoip gtk nls remote stats unicode upnp
-
-
-
-2
-
-configure install preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/amule-2.3.1 b/metadata/cache/net-p2p/amule-2.3.1
index f61136fc217a..3d62fdacf08c 100644
--- a/metadata/cache/net-p2p/amule-2.3.1
+++ b/metadata/cache/net-p2p/amule-2.3.1
@@ -6,7 +6,7 @@ mirror://sourceforge/amule/aMule-2.3.1.tar.bz2
 http://www.amule.org/
 GPL-2
 aMule, the all-platform eMule p2p client
-~alpha amd64 ppc ppc64 ~sparc x86
+alpha amd64 ppc ppc64 ~sparc x86
 eutils flag-o-matic multilib toolchain-funcs user wxwidgets
 daemon debug geoip nls remote stats unicode upnp +X
 
diff --git a/metadata/cache/sci-biology/clustalw-2.1 b/metadata/cache/sci-biology/clustalw-2.1
index bf55c9f9bf72..e93c25f1437f 100644
--- a/metadata/cache/sci-biology/clustalw-2.1
+++ b/metadata/cache/sci-biology/clustalw-2.1
@@ -6,7 +6,7 @@ http://www.clustal.org/download/current/clustalw-2.1.tar.gz
 http://www.clustal.org/
 GPL-3 LGPL-3
 General purpose multiple alignment program for DNA and proteins
-~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 
 
 
diff --git a/metadata/cache/sci-biology/clustalx-2.1 b/metadata/cache/sci-biology/clustalx-2.1
index 258561f43713..fd02398ceade 100644
--- a/metadata/cache/sci-biology/clustalx-2.1
+++ b/metadata/cache/sci-biology/clustalx-2.1
@@ -6,7 +6,7 @@ http://www.clustal.org/download/current/clustalx-2.1.tar.gz
 http://www.ebi.ac.uk/tools/clustalw2/
 GPL-3 LGPL-3
 Graphical interface for the ClustalW multiple alignment program
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib qt4-r2 toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-chemistry/arp-warp-bin-7.1 b/metadata/cache/sci-chemistry/arp-warp-bin-7.1
deleted file mode 100644
index eff522a68775..000000000000
--- a/metadata/cache/sci-chemistry/arp-warp-bin-7.1
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-lang/python-2*
-app-shells/tcsh sci-chemistry/refmac sys-apps/gawk virtual/jre virtual/opengl x11-libs/libX11 =dev-lang/python-2*
-0
-arp_warp_7.1.tar.gz
-fetch
-http://www.embl-hamburg.de/ARP/
-ArpWarp
-Software for improvement and interpretation of crystallographic electron density maps
--* amd64 x86 ~amd64-linux ~x86-linux
-eutils multilib prefix python toolchain-funcs user
-
-
-
-
-3
-
-install nofetch postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sci-chemistry/dssp-2.0.4 b/metadata/cache/sci-chemistry/dssp-2.0.4
new file mode 100644
index 000000000000..df4dc12dd807
--- /dev/null
+++ b/metadata/cache/sci-chemistry/dssp-2.0.4
@@ -0,0 +1,22 @@
+
+
+0
+ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/dssp-2.0.4.tgz
+
+http://swift.cmbi.ru.nl/gv/dssp/
+Boost-1.0
+The protein secondary structure standard
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/pymol-1.3.1_pre3925-r1 b/metadata/cache/sci-chemistry/pymol-1.3.1_pre3925-r1
index cc78c895cbfc..c4bb23e943cd 100644
--- a/metadata/cache/sci-chemistry/pymol-1.3.1_pre3925-r1
+++ b/metadata/cache/sci-chemistry/pymol-1.3.1_pre3925-r1
@@ -6,7 +6,7 @@ mirror://gentoo/pymol-1.3.1_pre3925-r1.tar.gz
 http://pymol.sourceforge.net/
 PSF-2.2
 A Python-extensible molecular graphics system
-amd64 ~ppc x86 ~amd64-linux ~x86-linux
+amd64 ppc x86 ~amd64-linux ~x86-linux
 distutils eutils multilib prefix python toolchain-funcs user
 apbs numpy shaders vmd
 
diff --git a/metadata/cache/sci-chemistry/scala-3.3.18-r2 b/metadata/cache/sci-chemistry/scala-3.3.18-r2
index 804bcc699408..54ee8c11f0df 100644
--- a/metadata/cache/sci-chemistry/scala-3.3.18-r2
+++ b/metadata/cache/sci-chemistry/scala-3.3.18-r2
@@ -6,7 +6,7 @@ ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.18.tar.gz
 http://www.ccp4.ac.uk/dist/html/scala.html
 ccp4
 Scale together multiple observations of reflections
-~amd64 ~ppc x86 ~amd64-linux ~x86-linux
+amd64 ~ppc x86 ~amd64-linux ~x86-linux
 autotools eutils fortran-2 libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-mathematics/singular-3.1.4-r1 b/metadata/cache/sci-mathematics/singular-3.1.4-r1
index 7b6ec87fb028..6ec0cf37a834 100644
--- a/metadata/cache/sci-mathematics/singular-3.1.4-r1
+++ b/metadata/cache/sci-mathematics/singular-3.1.4-r1
@@ -6,7 +6,7 @@ test
 http://www.singular.uni-kl.de/
 GPL-2
 Computer algebra system for polynomial computations
-~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
+amd64 ~ppc ~x86 ~x86-linux ~x86-macos
 autotools elisp-common eutils flag-o-matic libtool multilib prefix python toolchain-funcs user versionator
 boost doc emacs examples python +readline test
 
diff --git a/metadata/cache/sys-apps/nawk-20110810 b/metadata/cache/sys-apps/nawk-20110810
new file mode 100644
index 000000000000..2ecb60c2f33a
--- /dev/null
+++ b/metadata/cache/sys-apps/nawk-20110810
@@ -0,0 +1,22 @@
+virtual/yacc
+
+0
+http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz
+
+http://cm.bell-labs.com/cm/cs/awkbook/index.html
+MIT
+Brian Kernighan's pattern scanning and processing language
+~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/sys-cluster/gearmand-0.33 b/metadata/cache/sys-cluster/gearmand-0.33
new file mode 100644
index 000000000000..bd3dbfe91dce
--- /dev/null
+++ b/metadata/cache/sys-cluster/gearmand-0.33
@@ -0,0 +1,22 @@
+dev-libs/libevent || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) tcmalloc? ( dev-util/google-perftools ) memcache? ( >=dev-libs/libmemcached-0.47 ) drizzle? ( dev-db/drizzle ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) postgres? ( >=dev-db/postgresql-base-9.0 )
+dev-libs/libevent || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) tcmalloc? ( dev-util/google-perftools ) memcache? ( >=dev-libs/libmemcached-0.47 ) drizzle? ( dev-db/drizzle ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) postgres? ( >=dev-db/postgresql-base-9.0 )
+0
+http://launchpad.net/gearmand/trunk/0.33/+download/gearmand-0.33.tar.gz
+
+http://www.gearman.org/
+MIT
+Generic framework to farm out work to other machines
+~amd64 ~x86
+eutils flag-o-matic libtool multilib toolchain-funcs user
+debug tcmalloc +memcache drizzle sqlite tokyocabinet postgres
+
+
+
+4
+
+configure install postinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/crossdev-20120305 b/metadata/cache/sys-devel/crossdev-20120305
index 5e5de45d0c6f..042a93d56e64 100644
--- a/metadata/cache/sys-devel/crossdev-20120305
+++ b/metadata/cache/sys-devel/crossdev-20120305
@@ -6,7 +6,7 @@ mirror://gentoo/crossdev-20120305.tar.xz http://dev.gentoo.org/~vapier/dist/cros
 http://www.gentoo.org/
 GPL-2
 Gentoo Cross-toolchain generator
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-config-1.6 b/metadata/cache/sys-devel/gcc-config-1.6
index ee727bfd988b..5d733b25ce73 100644
--- a/metadata/cache/sys-devel/gcc-config-1.6
+++ b/metadata/cache/sys-devel/gcc-config-1.6
@@ -6,7 +6,7 @@ mirror://gentoo/gcc-config-1.6.tar.xz http://dev.gentoo.org/~vapier/dist/gcc-con
 http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git
 GPL-2
 utility to manage compilers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 multilib toolchain-funcs unpacker
 
 
diff --git a/metadata/cache/sys-devel/sparse-0.4.3 b/metadata/cache/sys-devel/sparse-0.4.3
index adad8b1cd673..5ee88bc22b8c 100644
--- a/metadata/cache/sys-devel/sparse-0.4.3
+++ b/metadata/cache/sys-devel/sparse-0.4.3
@@ -6,7 +6,7 @@ mirror://kernel/software/devel/sparse/dist/sparse-0.4.3.tar.bz2
 http://sparse.wiki.kernel.org/index.php/Main_Page
 OSL-1.1
 C semantic parser
-~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 eutils flag-o-matic multilib toolchain-funcs user
 gtk xml test
 
diff --git a/metadata/cache/sys-fs/s3ql-1.10 b/metadata/cache/sys-fs/s3ql-1.10
deleted file mode 100644
index 5d2fef2f2b52..000000000000
--- a/metadata/cache/sys-fs/s3ql-1.10
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse test? ( net-misc/rsync[xattr] dev-python/unittest2 ) =dev-lang/python-2*
-dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse =dev-lang/python-2*
-0
-http://s3ql.googlecode.com/files/s3ql-1.10.tar.bz2
-
-http://code.google.com/p/s3ql/
-GPL-3
-A full-featured file system for online data storage
-~amd64 ~x86
-distutils multilib python toolchain-funcs
-contrib doc test
-
-
-
-4
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/s3ql-1.11 b/metadata/cache/sys-fs/s3ql-1.11
deleted file mode 100644
index 40936b87cdd1..000000000000
--- a/metadata/cache/sys-fs/s3ql-1.11
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse test? ( net-misc/rsync[xattr] dev-python/unittest2 ) =dev-lang/python-2*
-dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse =dev-lang/python-2*
-0
-http://s3ql.googlecode.com/files/s3ql-1.11.tar.bz2
-
-http://code.google.com/p/s3ql/
-GPL-3
-A full-featured file system for online data storage
-~amd64 ~x86
-distutils multilib python toolchain-funcs
-contrib doc test
-
-
-
-4
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/genkernel-3.4.24_p1 b/metadata/cache/sys-kernel/genkernel-3.4.24_p1
index 234f98da3b58..e6073d169cf5 100644
--- a/metadata/cache/sys-kernel/genkernel-3.4.24_p1
+++ b/metadata/cache/sys-kernel/genkernel-3.4.24_p1
@@ -6,7 +6,7 @@ mirror://gentoo/genkernel-3.4.24_p1.tar.bz2 http://wolf31o2.org/sources/genkerne
 http://www.gentoo.org
 GPL-2
 Gentoo automatic kernel building scripts
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 bash-completion-r1 eutils multilib toolchain-funcs user
 ibm selinux
 
diff --git a/metadata/cache/sys-kernel/git-sources-3.5_rc1 b/metadata/cache/sys-kernel/git-sources-3.5_rc1
new file mode 100644
index 000000000000..234af231b9b2
--- /dev/null
+++ b/metadata/cache/sys-kernel/git-sources-3.5_rc1
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.5_rc1
+mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
+binchecks strip
+http://www.kernel.org
+GPL-2 freedist
+The very latest -git version of the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+symlink build
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/linux-firmware-20120502 b/metadata/cache/sys-kernel/linux-firmware-20120502
index f76e82957c71..a550f08210df 100644
--- a/metadata/cache/sys-kernel/linux-firmware-20120502
+++ b/metadata/cache/sys-kernel/linux-firmware-20120502
@@ -6,7 +6,7 @@ mirror://gentoo/linux-firmware-20120502.tar.xz
 http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 GPL-1 GPL-2 GPL-3 BSD freedist
 Linux firmware files
-~amd64 ~arm ~ia64 ~x86
+amd64 ~arm ~ia64 ~x86
 portability savedconfig
 savedconfig savedconfig
 
diff --git a/metadata/cache/sys-power/nut-2.6.3 b/metadata/cache/sys-power/nut-2.6.3
index ff05c49b59fa..aee59b7d087b 100644
--- a/metadata/cache/sys-power/nut-2.6.3
+++ b/metadata/cache/sys-power/nut-2.6.3
@@ -6,7 +6,7 @@ http://random.networkupstools.org/source/2.6/nut-2.6.3.tar.gz http://www.network
 http://www.networkupstools.org/
 GPL-2
 Network-UPS Tools
-~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 autotools bash-completion eutils fixheadtails libtool multilib toolchain-funcs user
 avahi cgi snmp usb ssl tcpd xml bash-completion
 
diff --git a/metadata/cache/sys-process/time-1.7-r1 b/metadata/cache/sys-process/time-1.7-r1
index 3929a4e9e404..a590b364c8bd 100644
--- a/metadata/cache/sys-process/time-1.7-r1
+++ b/metadata/cache/sys-process/time-1.7-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gnu/time/time-1.7.tar.gz
@@ -12,9 +12,9 @@ autotools eutils libtool multilib toolchain-funcs user
 
 
 
+4
 
-
-install unpack
+prepare
 
 
 
diff --git a/metadata/cache/virtual/awk-0 b/metadata/cache/virtual/awk-0
new file mode 100644
index 000000000000..f5a78209f7a1
--- /dev/null
+++ b/metadata/cache/virtual/awk-0
@@ -0,0 +1,22 @@
+
+|| ( sys-apps/gawk sys-apps/mawk sys-apps/nawk sys-apps/busybox )
+0
+
+
+
+
+Virtual for awk implementation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+
+
+
+
+
+
+
+-
+
+
+
+
+
diff --git a/metadata/cache/www-client/chromium-21.0.1155.2 b/metadata/cache/www-client/chromium-21.0.1155.2
index 7139319d65fd..f9ff397b141c 100644
--- a/metadata/cache/www-client/chromium-21.0.1155.2
+++ b/metadata/cache/www-client/chromium-21.0.1155.2
@@ -1,5 +1,5 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1155.2.tar.bz2
 
diff --git a/metadata/cache/www-servers/tomcat-7.0.27 b/metadata/cache/www-servers/tomcat-7.0.27
index 57fb7a55662d..c47418a91454 100644
--- a/metadata/cache/www-servers/tomcat-7.0.27
+++ b/metadata/cache/www-servers/tomcat-7.0.27
@@ -6,7 +6,7 @@ mirror://apache/tomcat/tomcat-7/v7.0.27/src/apache-tomcat-7.0.27-src.tar.gz
 http://tomcat.apache.org/
 Apache-2.0
 Tomcat Servlet-3.0/JSP-2.2 Container
-amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc examples source test elibc_FreeBSD
 
diff --git a/metadata/cache/x11-base/xorg-server-1.10.6-r1 b/metadata/cache/x11-base/xorg-server-1.10.6-r1
index 29fb8416f8c5..d5f7d8c91692 100644
--- a/metadata/cache/x11-base/xorg-server-1.10.6-r1
+++ b/metadata/cache/x11-base/xorg-server-1.10.6-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.10.6.tar.b
 http://xorg.freedesktop.org/
 MIT
 X.Org X servers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user versionator xorg-2
 dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
 !minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
diff --git a/metadata/cache/x11-base/xorg-server-1.11.4-r1 b/metadata/cache/x11-base/xorg-server-1.11.4-r1
index 34309811122b..dadd9800aaf9 100644
--- a/metadata/cache/x11-base/xorg-server-1.11.4-r1
+++ b/metadata/cache/x11-base/xorg-server-1.11.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.4.tar.b
 http://xorg.freedesktop.org/
 MIT
 X.Org X servers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user versionator xorg-2
 dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
 !minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
diff --git a/metadata/cache/x11-libs/libfakekey-0.1-r1 b/metadata/cache/x11-libs/libfakekey-0.1-r1
index 19500ff45c18..6559c8ae44d7 100644
--- a/metadata/cache/x11-libs/libfakekey-0.1-r1
+++ b/metadata/cache/x11-libs/libfakekey-0.1-r1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/libfakekey/0.1/libfakekey-0.1.tar.bz2
 http://matchbox-project.org/
 GPL-2
 Helper library for the x11-misc/matchbox-keyboard package.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 autotools eutils libtool multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/x11-libs/libmatchbox-1.9-r1 b/metadata/cache/x11-libs/libmatchbox-1.9-r1
index 908f3d404856..48299d85db4d 100644
--- a/metadata/cache/x11-libs/libmatchbox-1.9-r1
+++ b/metadata/cache/x11-libs/libmatchbox-1.9-r1
@@ -6,7 +6,7 @@ test
 http://matchbox-project.org/
 GPL-2
 The Matchbox Library.
-amd64 ~arm ~hppa ~mips ~ppc x86
+amd64 ~arm ~hppa ~mips ppc x86
 eutils libtool multilib toolchain-funcs user
 debug doc jpeg pango png static-libs test truetype X xsettings
 
diff --git a/metadata/cache/x11-misc/matchbox-keyboard-0.1 b/metadata/cache/x11-misc/matchbox-keyboard-0.1
index 6e8dfe8951a9..87e289547818 100644
--- a/metadata/cache/x11-misc/matchbox-keyboard-0.1
+++ b/metadata/cache/x11-misc/matchbox-keyboard-0.1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-keyboard/0.1/matchbox-keyboard-0.1.
 http://matchbox-project.org/
 GPL-2
 Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 debug cairo
 
diff --git a/metadata/cache/x11-misc/matchbox-panel-manager-0.1 b/metadata/cache/x11-misc/matchbox-panel-manager-0.1
index 47968cfb7348..cfbe9fbbaad2 100644
--- a/metadata/cache/x11-misc/matchbox-panel-manager-0.1
+++ b/metadata/cache/x11-misc/matchbox-panel-manager-0.1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-panel-manager/0.1/matchbox-panel-ma
 http://matchbox-project.org/
 GPL-2
 Matchbox panel configuration utility.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/x11-plugins/asmon-0.71 b/metadata/cache/x11-plugins/asmon-0.71
index 5618e39cbffc..1229f9c0dfa0 100644
--- a/metadata/cache/x11-plugins/asmon-0.71
+++ b/metadata/cache/x11-plugins/asmon-0.71
@@ -6,7 +6,7 @@ http://rio.vg/asmon/asmon-0.71.tar.bz2
 http://rio.vg/asmon
 GPL-2
 WindowMaker/AfterStep system monitor dockapp
-alpha ~amd64 ppc sparc x86
+alpha amd64 ppc sparc x86
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/x11-plugins/matchbox-applet-input-manager-0.6 b/metadata/cache/x11-plugins/matchbox-applet-input-manager-0.6
index 6919f3d9ce16..b0691f5284d3 100644
--- a/metadata/cache/x11-plugins/matchbox-applet-input-manager-0.6
+++ b/metadata/cache/x11-plugins/matchbox-applet-input-manager-0.6
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/mb-applet-input-manager/0.6/mb-applet-input-
 http://matchbox-project.org/
 GPL-2
 Matchbox panel tray app for managing software input methods.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 debug
 
diff --git a/metadata/cache/x11-plugins/matchbox-applet-startup-monitor-0.1 b/metadata/cache/x11-plugins/matchbox-applet-startup-monitor-0.1
index f0f3517d711f..3643732812bd 100644
--- a/metadata/cache/x11-plugins/matchbox-applet-startup-monitor-0.1
+++ b/metadata/cache/x11-plugins/matchbox-applet-startup-monitor-0.1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/mb-applet-startup-monitor/0.1/mb-applet-star
 http://matchbox-project.org/
 GPL-2
 Startup notification matchbox panel tray app.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/x11-plugins/matchbox-applet-volume-0.1 b/metadata/cache/x11-plugins/matchbox-applet-volume-0.1
index 366e9e4b1b86..568260ae3d63 100644
--- a/metadata/cache/x11-plugins/matchbox-applet-volume-0.1
+++ b/metadata/cache/x11-plugins/matchbox-applet-volume-0.1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/mb-applet-volume/0.1/mb-applet-volume-0.1.ta
 http://matchbox-project.org/
 GPL-2
 Matchbox panel tray app for controlling volume levels.
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/x11-plugins/matchbox-desktop-image-browser-0.2 b/metadata/cache/x11-plugins/matchbox-desktop-image-browser-0.2
index 97023277856a..27146e081463 100644
--- a/metadata/cache/x11-plugins/matchbox-desktop-image-browser-0.2
+++ b/metadata/cache/x11-plugins/matchbox-desktop-image-browser-0.2
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/mb-desktop-image-browser/0.2/mb-desktop-imag
 http://matchbox-project.org/
 GPL-2
 An alpha-ish image browser plug in for matchbox-desktop.
-~amd64 ~arm ~x86
+~amd64 ~arm ~ppc ~x86
 autotools eutils libtool multilib toolchain-funcs user versionator
 debug
 
diff --git a/metadata/cache/x11-plugins/matchbox-desktop-xine-0.4 b/metadata/cache/x11-plugins/matchbox-desktop-xine-0.4
index b03e5dbe215b..3abefa329d67 100644
--- a/metadata/cache/x11-plugins/matchbox-desktop-xine-0.4
+++ b/metadata/cache/x11-plugins/matchbox-desktop-xine-0.4
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/mb-desktop-xine/0.4/mb-desktop-xine-0.4.tar.
 http://matchbox-project.org/
 GPL-2
 A matchbox-desktop plugin that allows you to browse and play media.
-amd64 x86
+amd64 ~ppc x86
 autotools eutils libtool multilib toolchain-funcs user versionator
 debug
 
diff --git a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4 b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4
deleted file mode 100644
index 246e635961c2..000000000000
--- a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.6:2 >=x11-misc/icon-naming-utils-0.8.1 virtual/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
->=x11-libs/gtk+-2.6:2
-0
-http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.4.tar.bz2
-
-http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
-GPL-2
-Nimbus GTK+ Engine from Sun JDS
-amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-autotools gnome2-utils libtool multilib toolchain-funcs
-
-
-
-
-2
-
-configure install postinst postrm preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7 b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7
deleted file mode 100644
index 38398a655412..000000000000
--- a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/gtk+:2 >=x11-misc/icon-naming-utils-0.8.1 virtual/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
-x11-libs/gtk+:2
-0
-http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
-
-http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
-LGPL-2
-A GTK+-2 engine, icon and metacity themes from Sun JDS
-~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-autotools gnome2-utils libtool multilib toolchain-funcs
-
-
-
-
-4
-
-configure install postinst postrm preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2 b/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2
deleted file mode 100644
index 14284d49c0b0..000000000000
--- a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/gtk+:2 virtual/pkgconfig
-x11-libs/gtk+:2
-0
-mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-11.diff.gz
-
-http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
-GPL-2
-a derivative of the standard Clearlooks engine, using a more orange approach
-amd64 ~ppc x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3 b/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
index dd75b9bdddaf..3973001007a8 100644
--- a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+++ b/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
@@ -1,18 +1,18 @@
->=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=x11-libs/gtk+-2.8:2
+>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 x11-libs/gtk+:2
 0
 mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-12.diff.gz
 
 http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
 GPL-2
-a derivative of the standard Clearlooks engine, using a more orange approach
+A derivative of the standard Clearlooks GTK+ 2.x engine with more orange approach
 amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
 autotools eutils libtool multilib toolchain-funcs user
 
 
 
 
-2
+4
 
 configure install prepare
 
diff --git a/metadata/cache/x11-themes/matchbox-themes-extra-0.3 b/metadata/cache/x11-themes/matchbox-themes-extra-0.3
index 4eb597e642e5..f798bfa9e5b0 100644
--- a/metadata/cache/x11-themes/matchbox-themes-extra-0.3
+++ b/metadata/cache/x11-themes/matchbox-themes-extra-0.3
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-themes-extra/0.3/matchbox-themes-ex
 http://matchbox-project.org/
 GPL-2
 Extra themes for the matchbox window manager
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/x11-themes/nimbus-0.1.7-r1 b/metadata/cache/x11-themes/nimbus-0.1.7-r1
new file mode 100644
index 000000000000..83fecd973908
--- /dev/null
+++ b/metadata/cache/x11-themes/nimbus-0.1.7-r1
@@ -0,0 +1,22 @@
+gtk? ( x11-libs/gtk+:2 ) dev-util/intltool virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90 !gtk? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
+gtk? ( x11-libs/gtk+:2 ) !minimal? ( || ( x11-themes/gnome-icon-theme x11-themes/tango-icon-theme ) )
+0
+http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
+
+http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
+LGPL-2
+The default OpenSolaris theme (GTK+ 2.x engine, icon- and metacity theme)
+amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+autotools gnome2-utils libtool multilib toolchain-funcs
+gtk minimal
+
+
+
+4
+
+configure install postinst postrm preinst prepare
+
+
+
+
+
diff --git a/metadata/cache/x11-wm/matchbox-0.7.1 b/metadata/cache/x11-wm/matchbox-0.7.1
deleted file mode 100644
index cf0e5186c62f..000000000000
--- a/metadata/cache/x11-wm/matchbox-0.7.1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft dev-libs/expat x11-libs/startup-notification x11-libs/libxsettings-client png? ( >=media-libs/libpng-1.4 ) jpeg? ( virtual/jpeg ) x11-proto/xproto x11-proto/xextproto sys-devel/libtool
-x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft dev-libs/expat x11-libs/startup-notification x11-libs/libxsettings-client png? ( >=media-libs/libpng-1.4 ) jpeg? ( virtual/jpeg )
-0
-http://handhelds.org/~mallum/downloadables/matchbox-0.7.1.tar.gz
-
-http://matchbox-project.org/
-GPL-2
-Light weight WM designed for use on PDA computers
-~amd64 ppc x86
-eutils flag-o-matic multilib toolchain-funcs user
-jpeg png nls debug
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/x11-wm/matchbox-1.0 b/metadata/cache/x11-wm/matchbox-1.0
index adee41595bf9..a337a35373b3 100644
--- a/metadata/cache/x11-wm/matchbox-1.0
+++ b/metadata/cache/x11-wm/matchbox-1.0
@@ -6,7 +6,7 @@ x11-wm/matchbox-common x11-wm/matchbox-desktop x11-wm/matchbox-panel x11-wm/matc
 http://matchbox-project.org/
 as-is
 Light weight WM designed for use on PDA computers
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 
 minimal
 
diff --git a/metadata/cache/x11-wm/matchbox-common-0.9.1-r2 b/metadata/cache/x11-wm/matchbox-common-0.9.1-r2
index 9abf034a1796..9c56c15217bb 100644
--- a/metadata/cache/x11-wm/matchbox-common-0.9.1-r2
+++ b/metadata/cache/x11-wm/matchbox-common-0.9.1-r2
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-common/0.9/matchbox-common-0.9.1.ta
 http://matchbox-project.org/
 GPL-2
 Common files used by matchbox-panel and matchbox-desktop packages
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 pda
 
diff --git a/metadata/cache/x11-wm/matchbox-desktop-0.9.1 b/metadata/cache/x11-wm/matchbox-desktop-0.9.1
index f5621d368e2b..1ff201db286c 100644
--- a/metadata/cache/x11-wm/matchbox-desktop-0.9.1
+++ b/metadata/cache/x11-wm/matchbox-desktop-0.9.1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-desktop/0.9/matchbox-desktop-0.9.1.
 http://matchbox-project.org/
 GPL-2
 The Matchbox Desktop
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils multilib toolchain-funcs user versionator
 debug dnotify startup-notification
 
diff --git a/metadata/cache/x11-wm/matchbox-panel-0.9.3-r1 b/metadata/cache/x11-wm/matchbox-panel-0.9.3-r1
index 4588b5183970..127205e7c6c9 100644
--- a/metadata/cache/x11-wm/matchbox-panel-0.9.3-r1
+++ b/metadata/cache/x11-wm/matchbox-panel-0.9.3-r1
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.
 http://matchbox-project.org/
 GPL-2
 The Matchbox Panel
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 autotools eutils libtool multilib toolchain-funcs user versionator
 acpi debug dnotify lowres nls startup-notification wifi
 
diff --git a/metadata/cache/x11-wm/matchbox-window-manager-1.2 b/metadata/cache/x11-wm/matchbox-window-manager-1.2
index 4f07be1a5185..a6af0782ea6d 100644
--- a/metadata/cache/x11-wm/matchbox-window-manager-1.2
+++ b/metadata/cache/x11-wm/matchbox-window-manager-1.2
@@ -6,7 +6,7 @@ http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-
 http://matchbox-project.org/
 GPL-2
 Light weight WM designed for use on PDA computers
-amd64 ~arm ~hppa ~ppc x86
+amd64 ~arm ~hppa ppc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 debug expat gnome session startup-notification xcomposite debug
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 31d82edd152a..094c84e7b060 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Jun 2012 15:07:41 +0000
+Mon, 04 Jun 2012 10:07:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d5cbef51bdba..094c84e7b060 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Jun 2012 15:07:42 +0000
+Mon, 04 Jun 2012 10:07:26 +0000
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r1 b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r1
index d00de721061b..0219c2b46c51 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r1
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( <=app-accessibility/mbrola-3.0.1h-r5 ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29e6303145707b1766f19961f5725696
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 31a747901e59..3b1598a94599 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47d1f65838064f4ecd5292d71dbd8e4a
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.24.2 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.24.2
index 403013c9b33a..f76bc653fd79 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.24.2
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.24.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.24/java-access-bridge-1.24.2.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3891a78c45fca54ea6e05ba1afa99a58
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
index bcdb6a28fc72..de6fb0906911 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.26.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.26/java-access-bridge-1.26.0.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7d9be437f5b3ff6158e1716f1a4347a
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0
index 57db5ac786f3..d2609e89a187 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.6/java-access-bridge-1.6.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd9ad148520a1b9a16a9308cc5ee69b8
diff --git a/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0-r2 b/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0-r2
index b2c00097ccae..2de15e083146 100644
--- a/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0-r2
+++ b/metadata/md5-cache/app-accessibility/java-access-bridge-1.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/java-access-bridge/1.6/java-access-bridge-1.6.0.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f306c3bba207d70a0851527af485615c
diff --git a/metadata/md5-cache/app-admin/389-admin-console-1.1.7 b/metadata/md5-cache/app-admin/389-admin-console-1.1.7
index 7dfb30c4ff79..8aa02e5d0355 100644
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.7
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.7
@@ -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.7.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7cf20f8793b323aa04e19f5e4226e9a
diff --git a/metadata/md5-cache/app-admin/389-admin-console-1.1.8 b/metadata/md5-cache/app-admin/389-admin-console-1.1.8
index 11f225b3ff6c..8ed8e056a3b7 100644
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.8
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=113c260a6c257fed0f801e05bcb9329f
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.6 b/metadata/md5-cache/app-admin/389-console-1.1.6
index a5d0cc73e5aa..d53dd3ce1dca 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.6
+++ b/metadata/md5-cache/app-admin/389-console-1.1.6
@@ -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 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.6.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=431ab1effce4261ce65e72a123d4a755
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.7 b/metadata/md5-cache/app-admin/389-console-1.1.7
index 281f8ed4df10..e4591f9e1446 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.7
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7
@@ -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 app-admin/389-admin-console >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8eb1e199363df9b9fa6eea4dff2ec82d
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1 b/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1
index 138aa85f1045..bd0bb542b21d 100644
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.3-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.3.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6754bb28ef12e7e00939737ad83f7113
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.6 b/metadata/md5-cache/app-admin/389-ds-console-1.2.6
index 0deaa318a1d1..7f8e66f1150c 100644
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.6
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a0aa4c66b9d161ea294a2bc9c85e1cc
diff --git a/metadata/md5-cache/app-admin/eselect-awk-0.2 b/metadata/md5-cache/app-admin/eselect-awk-0.2
new file mode 100644
index 000000000000..ab5362ef024a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-awk-0.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Manages the {,/usr}/bin/awk symlink
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+KEYWORDS=~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~ottxor/distfiles/eselect-awk-0.2.tar.gz
+_md5_=d165132f97b266fb229f40d7df601f9d
diff --git a/metadata/md5-cache/app-admin/eselect-boost-0.4 b/metadata/md5-cache/app-admin/eselect-boost-0.4
index 16beda3118a0..d0d5626ea469 100644
--- a/metadata/md5-cache/app-admin/eselect-boost-0.4
+++ b/metadata/md5-cache/app-admin/eselect-boost-0.4
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=boost module for eselect
 HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=6cd902be142a9d06db23e4ea6c7d1f0d
+_md5_=f6be54282d9913ccfe6e93fdf9302f5c
diff --git a/metadata/md5-cache/app-admin/eselect-rails-0.18 b/metadata/md5-cache/app-admin/eselect-rails-0.18
index 4c604cf65c6e..26b483129410 100644
--- a/metadata/md5-cache/app-admin/eselect-rails-0.18
+++ b/metadata/md5-cache/app-admin/eselect-rails-0.18
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=Manages Ruby on Rails symlinks
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~amd64 ~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=amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~flameeyes/ruby-team/eselect-rails-0.18.tar.bz2
-_md5_=3970fa04933f73e609cee6ad0cfcf788
+_md5_=55645b2724187a06a6537657be6287b3
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.14 b/metadata/md5-cache/app-admin/logcheck-1.3.14
index 8553f61c2c97..b8261b1b3f0e 100644
--- a/metadata/md5-cache/app-admin/logcheck-1.3.14
+++ b/metadata/md5-cache/app-admin/logcheck-1.3.14
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst setup
 DESCRIPTION=Mails anomalies in the system logfiles to the administrator.
 HOMEPAGE=http://packages.debian.org/sid/logcheck
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.14.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6b2402edec103e4caa2572f9eba39657
+_md5_=e4151f2d1867b9ac6400b15c548f9f05
diff --git a/metadata/md5-cache/app-admin/profiler-1-r1 b/metadata/md5-cache/app-admin/profiler-1-r1
index 3acaf41b6bad..658a55df4ff5 100644
--- a/metadata/md5-cache/app-admin/profiler-1-r1
+++ b/metadata/md5-cache/app-admin/profiler-1-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/profiler.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e4882887bd5fa090518bfde1d2761c0
diff --git a/metadata/md5-cache/app-arch/lzip-1.13 b/metadata/md5-cache/app-arch/lzip-1.13
index ede9bcfa6c54..0c0c5928367f 100644
--- a/metadata/md5-cache/app-arch/lzip-1.13
+++ b/metadata/md5-cache/app-arch/lzip-1.13
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=lossless data compressor based on the LZMA algorithm
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.13.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d045730f62b6a87490a65253edd231e3
+_md5_=4456bfb02afb6adbead24239119ec32a
diff --git a/metadata/md5-cache/app-arch/rpm-4.9.1.3 b/metadata/md5-cache/app-arch/rpm-4.9.1.3
index 735f03229fb9..4232f91f868a 100644
--- a/metadata/md5-cache/app-arch/rpm-4.9.1.3
+++ b/metadata/md5-cache/app-arch/rpm-4.9.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=Red Hat Package Management Utils
 EAPI=4
 HOMEPAGE=http://www.rpm.org
 IUSE=nls python doc caps lua acl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) dev-lang/perl[-build] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://rpm.org/releases/rpm-4.9.x/rpm-4.9.1.3.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f507294a43e80311d7f1ab38cbf51024
+_md5_=cf0715455fa836c82d64eb10b5ea6060
diff --git a/metadata/md5-cache/app-backup/deja-dup-22.1 b/metadata/md5-cache/app-backup/deja-dup-22.1
index e5a0400cc9f2..0c0eae11f55c 100644
--- a/metadata/md5-cache/app-backup/deja-dup-22.1
+++ b/metadata/md5-cache/app-backup/deja-dup-22.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=4
 HOMEPAGE=https://launchpad.net/deja-dup/
 IUSE=nautilus debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libnotify app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) gnome-base/gvfs[fuse]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/22/22.1/+download/deja-dup-22.1.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ac61bead2244bbe27cafa2816620c66e
+_md5_=638166ff24d841c7a5df3ccd173b8b9b
diff --git a/metadata/md5-cache/app-benchmarks/i7z-0.27.1 b/metadata/md5-cache/app-benchmarks/i7z-0.27.1
index 5c58f4875677..c483156d7cda 100644
--- a/metadata/md5-cache/app-benchmarks/i7z-0.27.1
+++ b/metadata/md5-cache/app-benchmarks/i7z-0.27.1
@@ -4,10 +4,10 @@ DESCRIPTION=A better i7 (and now i3, i5) reporting tool for Linux
 EAPI=4
 HOMEPAGE=http://code.google.com/p/i7z/
 IUSE=X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses X? ( x11-libs/qt-gui:4 )
 SLOT=0
 SRC_URI=http://i7z.googlecode.com/files/i7z-0.27.1.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=504f715e4eee65d1165e6fb7224874c5
+_md5_=b4ad4098bc94e3bfca53f6afc643f220
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r2 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r2
index 87ce6e10ba2a..2acc351b8f1f 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r2
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r2
@@ -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* dev-java/sun-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ffbc3f8d214769fdcefb9c47bde98622
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r3 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r3
index 30746d5f0b68..a4ac0641a958 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r3
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r3
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58c684081760dec2525812780b7cb13f
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 250372adb286..414b8a5e00ff 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f70f460fb114bb0a04e03018ef9d90cf
diff --git a/metadata/md5-cache/app-cdr/cdw-0.7.1 b/metadata/md5-cache/app-cdr/cdw-0.7.1
index 4a439b085f79..1af15d1d026c 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.7.1
+++ b/metadata/md5-cache/app-cdr/cdw-0.7.1
@@ -3,10 +3,10 @@ DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=2
 HOMEPAGE=http://cdw.sourceforge.net
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.7.1.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fa9ebf718f2edf608cafac9398e29c3c
+_md5_=0625b384fc4e8157d9972ac6a723d1fd
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 ae1013ec55ca..3a4a0e67c9c8 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4b3f9e63f523..1bf37f04e6ca 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d0834201c08c2dba01c19c1cbdd0653
diff --git a/metadata/md5-cache/app-editors/gobby-0.4.13 b/metadata/md5-cache/app-editors/gobby-0.4.13
index bbc66edf6758..f022ea3cf18c 100644
--- a/metadata/md5-cache/app-editors/gobby-0.4.13
+++ b/metadata/md5-cache/app-editors/gobby-0.4.13
@@ -4,11 +4,11 @@ DESCRIPTION=GTK-based collaborative editor
 EAPI=4
 HOMEPAGE=http://gobby.0x539.de/
 IUSE=avahi gnome
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 >=net-libs/obby-0.4.6[avahi?] dev-cpp/libxmlpp:2.6 x11-libs/gtksourceview:2.0 gnome? ( gnome-base/gnome-vfs )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.0x539.de/gobby/gobby-0.4.13.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9a5976bcd027a3b1b331d81b8ca01472
+_md5_=1845c8b844f161ac427c4594e4f9b90c
diff --git a/metadata/md5-cache/app-editors/jedit-4.3.2 b/metadata/md5-cache/app-editors/jedit-4.3.2
index 23832f9de9c8..78db4124c0cb 100644
--- a/metadata/md5-cache/app-editors/jedit-4.3.2
+++ b/metadata/md5-cache/app-editors/jedit-4.3.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/jedit/jedit4.3.2source.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd5df614d2a67d124831bf28de92f68e
diff --git a/metadata/md5-cache/app-editors/jedit-4.4.2 b/metadata/md5-cache/app-editors/jedit-4.4.2
index 2e51919c26fe..9aaf80961b96 100644
--- a/metadata/md5-cache/app-editors/jedit-4.4.2
+++ b/metadata/md5-cache/app-editors/jedit-4.4.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/jedit/jedit4.4.2source.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d90ae9ae182fe30c64b4a8b899b46fbd
diff --git a/metadata/md5-cache/app-editors/jedit-4.4.2-r1 b/metadata/md5-cache/app-editors/jedit-4.4.2-r1
index fd8903833a3b..70d0d7b6f66f 100644
--- a/metadata/md5-cache/app-editors/jedit-4.4.2-r1
+++ b/metadata/md5-cache/app-editors/jedit-4.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c4a5104bec9ec3eef9bbc6792257dc44
diff --git a/metadata/md5-cache/app-editors/jext-5.0 b/metadata/md5-cache/app-editors/jext-5.0
index 71fc934f32a4..5915c3601c89 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed1fd77467d790cc0dbdc1c6d45e5666
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r2 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r2
index ed4ebed9867d..43f41d430879 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r2
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-common-gentoo-1.3.tar.gz
 _eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=09a8561307b40ee62195bce01b750c50
+_md5_=1ff7267d43ea748e7a57de5ea2f5c388
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.0.1 b/metadata/md5-cache/app-emacs/jde-2.4.0.1
index 55d4d538997f..dfb7e5158835 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.0.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib >=app-emacs/cedet-1.0_beta3 dev-java/bsh dev-java/junit:0 dev-util/checkstyle >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/jde-2.4.0.1.tar.bz2
-_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e6ca71876fad03cb0e806ca6e8fe5c17
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1_pre20110622 b/metadata/md5-cache/app-emacs/jde-2.4.1_pre20110622
index 49cdb65b5e36..d64d8d48ac1b 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1_pre20110622
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1_pre20110622
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib virtual/emacs-cedet dev-java/bsh dev-java/junit:0 dev-util/checkstyle >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jde-2.4.1_pre20110622.tar.gz
-_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9175303e39f304a5ebccd0b16a9bbba
diff --git a/metadata/md5-cache/app-emulation/libvirt-0.9.11.3 b/metadata/md5-cache/app-emulation/libvirt-0.9.11.3
index 4be498f9dd72..70d28a4e2be1 100644
--- a/metadata/md5-cache/app-emulation/libvirt-0.9.11.3
+++ b/metadata/md5-cache/app-emulation/libvirt-0.9.11.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=4
 HOMEPAGE=http://www.libvirt.org/
 IUSE=avahi caps debug iscsi +libvirtd lvm +lxc macvtap nfs nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev uml virtualbox virt-network xen elibc_glibc
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-0.9.11.3.tar.gz ftp://libvirt.org/libvirt/libvirt-0.9.11.3.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=43d589043870c0680cc3c2c4cbefdcd4
+_md5_=ed26085880f94f413053460d0384f593
diff --git a/metadata/md5-cache/app-emulation/libvirt-0.9.12 b/metadata/md5-cache/app-emulation/libvirt-0.9.12
new file mode 100644
index 000000000000..b2d020908ec1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=4
+HOMEPAGE=http://www.libvirt.org/
+IUSE=avahi +caps debug iscsi +libvirtd lvm +lxc macvtap nfs nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev uml virtualbox virt-network xen elibc_glibc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl sys-power/pm-utils ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/libvirt-0.9.12.tar.gz ftp://libvirt.org/libvirt/libvirt-0.9.12.tar.gz
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=d6ffcd84615d131b5d3f0b7bdcc4f527
diff --git a/metadata/md5-cache/app-emulation/q4wine-0.999_rc7 b/metadata/md5-cache/app-emulation/q4wine-0.999_rc7
new file mode 100644
index 000000000000..6b8aff85ac23
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/q4wine-0.999_rc7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite] dev-util/cmake >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Qt4 GUI configuration tool for Wine
+EAPI=4
+HOMEPAGE=http://q4wine.brezblock.org.ua/
+IUSE=debug +icoutils +wineappdb -dbus gnome kde linguas_cs linguas_de linguas_en linguas_es linguas_he linguas_it linguas_ru linguas_uk linguas_pl linguas_pt
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-sql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( x11-libs/qt-dbus:4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/q4wine/q4wine/q4wine%200.999-rc7/q4wine-0.999-rc7.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=83fc02f4a6538d2436bb6c058004041d
diff --git a/metadata/md5-cache/app-misc/astrolog-5.40-r1 b/metadata/md5-cache/app-misc/astrolog-5.40-r1
index ce08fe802c28..6c6396cb8ef0 100644
--- a/metadata/md5-cache/app-misc/astrolog-5.40-r1
+++ b/metadata/md5-cache/app-misc/astrolog-5.40-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A many featured astrology chart calculation program
 EAPI=4
 HOMEPAGE=http://www.astrolog.org/astrolog.htm
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=astrolog
 RDEPEND=X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://www.astrolog.org/ftp/ast54unx.shr
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=dc362abeef951bc0f75b9691a3b02658
+_md5_=1f84945e8984af5634ee22763cbddce8
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
index da76adbd5a15..9b8f0c3f3667 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77725f0a5a5146546b54bfe5cb8e8f0c
diff --git a/metadata/md5-cache/app-misc/freemind-0.8.0-r3 b/metadata/md5-cache/app-misc/freemind-0.8.0-r3
index 860799e96609..ac887762b254 100644
--- a/metadata/md5-cache/app-misc/freemind-0.8.0-r3
+++ b/metadata/md5-cache/app-misc/freemind-0.8.0-r3
@@ -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/freemind/freemind-src-0_8_0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d81f188c9f5941e538c698b94d9ef64
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0 b/metadata/md5-cache/app-misc/freemind-0.9.0
index f07094f1c782..6b5f8cc61740 100644
--- a/metadata/md5-cache/app-misc/freemind-0.9.0
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0
@@ -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/jsr173 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=735ad3207a735024a66984de96cefea5
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0_rc6 b/metadata/md5-cache/app-misc/freemind-0.9.0_rc6
index 8139ce910a6d..d70eeef9f2c0 100644
--- a/metadata/md5-cache/app-misc/freemind-0.9.0_rc6
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0_rc6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 dev-java/commons-lang:2.1 dev-java/javahelp: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_RC_6.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b42f2e73e07e397e8d5f78fc64d8122
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0_rc7 b/metadata/md5-cache/app-misc/freemind-0.9.0_rc7
index f4a072c670ed..4183f3415cc8 100644
--- a/metadata/md5-cache/app-misc/freemind-0.9.0_rc7
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0_rc7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 dev-java/commons-lang:2.1 dev-java/javahelp: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_RC_7.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=097622173c6e64416a8010e2fa89ef05
diff --git a/metadata/md5-cache/app-misc/jbidwatcher-1.0.2-r1 b/metadata/md5-cache/app-misc/jbidwatcher-1.0.2-r1
index cbc17e10f421..f27e17420bd0 100644
--- a/metadata/md5-cache/app-misc/jbidwatcher-1.0.2-r1
+++ b/metadata/md5-cache/app-misc/jbidwatcher-1.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=0
 SRC_URI=http://www.jbidwatcher.com/download/jbidwatcher-1.0.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c5d04ac41610e3b25e94c9f6ef8149b
diff --git a/metadata/md5-cache/app-misc/jdictionary-1.8-r2 b/metadata/md5-cache/app-misc/jdictionary-1.8-r2
index 966be2d6b67c..f7a96f593e3d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=13a7cf002aa52339344a382eacb75530
diff --git a/metadata/md5-cache/app-misc/jitac-0.2.0-r3 b/metadata/md5-cache/app-misc/jitac-0.2.0-r3
index 861e01d2afd1..7947d4a76b4d 100644
--- a/metadata/md5-cache/app-misc/jitac-0.2.0-r3
+++ b/metadata/md5-cache/app-misc/jitac-0.2.0-r3
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.3 dev-java/sun-jimi >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.roqe.org/jitac/jitac-0.2.0.src.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e748b207bbc6199db9f6c2b34384d8d
diff --git a/metadata/md5-cache/app-misc/ktoblzcheck-1.39 b/metadata/md5-cache/app-misc/ktoblzcheck-1.39
new file mode 100644
index 000000000000..2187cef67178
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.39
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=app-text/recode sys-apps/gawk sys-apps/grep sys-apps/sed || ( net-misc/wget www-client/lynx ) >=sys-devel/libtool-2.2.6b python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DESCRIPTION=Library to check account numbers and bank codes of German banks
+EAPI=4
+HOMEPAGE=http://ktoblzcheck.sourceforge.net/
+IUSE=python
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/recode sys-apps/gawk sys-apps/grep sys-apps/sed || ( net-misc/wget www-client/lynx ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.39.tar.gz
+_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=a68b1a9a57532fc675eabaddefce015a
diff --git a/metadata/md5-cache/app-misc/lockfile-progs-0.1.16 b/metadata/md5-cache/app-misc/lockfile-progs-0.1.16
index b6f5c0e7e61f..aebf5c2e8e81 100644
--- a/metadata/md5-cache/app-misc/lockfile-progs-0.1.16
+++ b/metadata/md5-cache/app-misc/lockfile-progs-0.1.16
@@ -3,9 +3,9 @@ DEPEND=net-libs/liblockfile
 DESCRIPTION=Programs to safely lock/unlock files and mailboxes
 EAPI=4
 HOMEPAGE=http://packages.debian.org/sid/lockfile-progs
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~mips ppc ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/liblockfile
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_0.1.16.tar.gz
-_md5_=166281ea209608e05ef554028e2a7911
+_md5_=665e5d7d390e291ba808462572598ed9
diff --git a/metadata/md5-cache/app-misc/muttprint-0.73-r1 b/metadata/md5-cache/app-misc/muttprint-0.73-r1
index 7d0b4f687317..5edb75c28bb5 100644
--- a/metadata/md5-cache/app-misc/muttprint-0.73-r1
+++ b/metadata/md5-cache/app-misc/muttprint-0.73-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Script for pretty printing of your mails
 EAPI=4
 HOMEPAGE=http://muttprint.sourceforge.net
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/latex-base dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=mirror://sourceforge/muttprint/muttprint-0.73.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	7bd9188561818b742702e8b7b21fd8d3	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2b4e88c1d8308ced4c3d2476f4360903
+_md5_=dbbe700d3dfad66315eed7144fbbd519
diff --git a/metadata/md5-cache/app-misc/pysmssend-1.48 b/metadata/md5-cache/app-misc/pysmssend-1.48
index b6e9374f3391..0030295f8158 100644
--- a/metadata/md5-cache/app-misc/pysmssend-1.48
+++ b/metadata/md5-cache/app-misc/pysmssend-1.48
@@ -4,10 +4,10 @@ DESCRIPTION=Python Application for sending sms over multiple ISPs
 EAPI=3
 HOMEPAGE=http://pysmssend.silverarrow.org/
 IUSE=qt4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>dev-python/mechanize-0.1.7b qt4? ( dev-python/PyQt4[X] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://pysmssend.silverarrow.org/files/pysmssend-1.48.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e7d82e515ff01b9fc77457ae392e1b71
+_md5_=2f015eae1242befdab2d1413897e7dd6
diff --git a/metadata/md5-cache/app-misc/slashtime-0.5.11 b/metadata/md5-cache/app-misc/slashtime-0.5.11
index 1ef6fc0c9b42..653d6bf16e00 100644
--- a/metadata/md5-cache/app-misc/slashtime-0.5.11
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-gnome-4.0.14_rc2:4.0 >=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.11.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28173eccb3a6aa4e423eccc8305d598c
diff --git a/metadata/md5-cache/app-misc/slashtime-0.5.12 b/metadata/md5-cache/app-misc/slashtime-0.5.12
index 844d7316f785..c0ed50bfa269 100644
--- a/metadata/md5-cache/app-misc/slashtime-0.5.12
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-gnome-4.0.16:4.0 >=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.12.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41a8ca04f7015f50ee040df614cbca71
diff --git a/metadata/md5-cache/app-office/borg-1.7.4 b/metadata/md5-cache/app-office/borg-1.7.4
index 6144e50d7577..c92fa17d3175 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4
+++ b/metadata/md5-cache/app-office/borg-1.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/sun-javamail:0 dev-java/javahelp:0 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg_src_1_7_4.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a826be91521ac19134bfd813520502eb
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.1 b/metadata/md5-cache/app-office/hourglass-0.7.1
index c4866fcf8222..acbc163881eb 100644
--- a/metadata/md5-cache/app-office/hourglass-0.7.1
+++ b/metadata/md5-cache/app-office/hourglass-0.7.1
@@ -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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a5550cf9b31b12ec495f05e1ec85159
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.2 b/metadata/md5-cache/app-office/hourglass-0.7.2
index 8e3113c36daa..ac0c69503ae8 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54092be62527e8508d525e0c3fa20ab7
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.4.2-r1
index 8bcc8dd20c52..1e71648ed5b6 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.4.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.4.2-r1
@@ -9,4 +9,4 @@ RDEPEND==app-office/libreoffice-bin-3.5.4.2-r1[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( kde? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-kde-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-kde-java-3.5.4.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-java-3.5.4.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-base-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-base-java-3.5.4.2-r1.tar.xz ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.5.4.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.5.4.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.5.4.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.5.4.2-r1.tar.xz ) ) ) )
-_md5_=dc708e09f54304a58ab0c0cebca350a7
+_md5_=321ef48bc44aed327c2c56a91ad33de8
diff --git a/metadata/md5-cache/app-shells/zsh-4.3.17 b/metadata/md5-cache/app-shells/zsh-4.3.17
index 5bd6437620cb..fb2e7fdb1e03 100644
--- a/metadata/md5-cache/app-shells/zsh-4.3.17
+++ b/metadata/md5-cache/app-shells/zsh-4.3.17
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=4
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsh/zsh-4.3.17.tar.bz2 ftp://ftp.zsh.org/pub/zsh-4.3.17.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-4.3.17-doc.tar.bz2 )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a6d9aa9740cb5914b36ca6433907a255
+_md5_=777c724c642c5f61b8dcce979ba708a9
diff --git a/metadata/md5-cache/app-text/acroread-9.5.1-r1 b/metadata/md5-cache/app-text/acroread-9.5.1-r1
new file mode 100644
index 000000000000..306c35912ea7
--- /dev/null
+++ b/metadata/md5-cache/app-text/acroread-9.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=dev-util/bsdiff >=sys-apps/sed-4
+DESCRIPTION=Adobe's PDF reader
+EAPI=4
+HOMEPAGE=http://www.adobe.com/products/reader/
+IUSE=cups ldap minimal nsplugin linguas_en linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Adobe
+RDEPEND=media-libs/fontconfig x86? ( =dev-libs/openssl-0.9.8* ) cups? ( net-print/cups ) x86? ( x11-libs/gtk+:2 net-dns/libidn ldap? ( net-nds/openldap ) !minimal? ( || ( www-client/firefox www-client/firefox-bin www-client/seamonkey ) ) ) amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 ) !linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 )
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=3f199cda3752d468c272ccb3efc3cae6
diff --git a/metadata/md5-cache/app-text/epubcheck-1.1 b/metadata/md5-cache/app-text/epubcheck-1.1
index 1362da2368fd..ee613d8ad8c3 100644
--- a/metadata/md5-cache/app-text/epubcheck-1.1
+++ b/metadata/md5-cache/app-text/epubcheck-1.1
@@ -9,5 +9,5 @@ LICENSE=as-is 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9854f7cea78853923df54af714a1dff1
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1 b/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
index e632fd047992..3fe9a3419e2e 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? (
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.10.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=21302a78cde6c59d3e4981bf0004eefd
+_md5_=dc34cbcd9918ecf7922dc60fe2e79b8e
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index 4e6ede95fb5d..5bb94a31593b 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? (
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d1a37845296f36afd740c4192a5126bd
+_md5_=26c408203679629423e078ac30ab1f8d
diff --git a/metadata/md5-cache/app-text/jabref-2.3.1 b/metadata/md5-cache/app-text/jabref-2.3.1
index 733de7336171..0308f5572d44 100644
--- a/metadata/md5-cache/app-text/jabref-2.3.1
+++ b/metadata/md5-cache/app-text/jabref-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/spin:0 >=dev-java/glazedlists-1.5.0:0 >=dev-java/antlr-2.7.7:0[java] >=dev-java/jgoodies-forms-1.1.0:0 >=dev-java/jgoodies-looks-2.0:2.0 >=dev-java/microba-0.4.3:0 dev-java/jempbox:0 dev-java/pdfbox:0 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.3.1-src.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d40f56e1818b2ff7f8e573e993a027cc
diff --git a/metadata/md5-cache/app-text/jabref-2.5 b/metadata/md5-cache/app-text/jabref-2.5
index 4e4f79a73444..9751235485b8 100644
--- a/metadata/md5-cache/app-text/jabref-2.5
+++ b/metadata/md5-cache/app-text/jabref-2.5
@@ -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.5-src.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98ab87c9d9d3fd85af5aedbdf973b99f
diff --git a/metadata/md5-cache/app-text/jabref-2.6 b/metadata/md5-cache/app-text/jabref-2.6
index 63bf196ce822..ce159b083f92 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8af957ae5b206e03f09ac26e2288689c
diff --git a/metadata/md5-cache/app-text/jabref-2.6_beta3 b/metadata/md5-cache/app-text/jabref-2.6_beta3
index d9afc694084d..42db37986c5c 100644
--- a/metadata/md5-cache/app-text/jabref-2.6_beta3
+++ b/metadata/md5-cache/app-text/jabref-2.6_beta3
@@ -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.6b3-src.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f040b93bfcf7b452c6f0acd0b0539177
diff --git a/metadata/md5-cache/app-text/jing-20030619-r3 b/metadata/md5-cache/app-text/jing-20030619-r3
index 283436044c4d..d02cd90e8832 100644
--- a/metadata/md5-cache/app-text/jing-20030619-r3
+++ b/metadata/md5-cache/app-text/jing-20030619-r3
@@ -8,5 +8,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/saxon-8* >=dev-java/xerces-2.7 dev-java/iso-relax dev-java/xalan dev-java/relaxng-datatype dev-java/ant-core >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.thaiopensource.com/download/jing-20030619.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c46eb79120a4cb210ed7e6c087784dc
diff --git a/metadata/md5-cache/app-text/jing-20091111 b/metadata/md5-cache/app-text/jing-20091111
index 8aef6c773d2a..95d9f5621f56 100644
--- a/metadata/md5-cache/app-text/jing-20091111
+++ b/metadata/md5-cache/app-text/jing-20091111
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb921092743c27782256bf9d562732ea
diff --git a/metadata/md5-cache/app-text/jpdftweak-0.9 b/metadata/md5-cache/app-text/jpdftweak-0.9
index fe992ff3b6b7..1b7c5fde3038 100644
--- a/metadata/md5-cache/app-text/jpdftweak-0.9
+++ b/metadata/md5-cache/app-text/jpdftweak-0.9
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a10336436fc50d03a5d57d1df58aa15f
diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.92 b/metadata/md5-cache/app-text/lcdf-typetools-2.92
index d6a4f1f255d0..6a7f4a719fd0 100644
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.92
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.92
@@ -4,9 +4,9 @@ DESCRIPTION=Font utilities for eg manipulating OTF
 EAPI=2
 HOMEPAGE=http://www.lcdf.org/type/#typetools
 IUSE=+kpathsea
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=kpathsea? ( virtual/tex-base )
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz
-_md5_=654858a21ec19b8f9bda25cb5bfd4af4
+_md5_=9a4294f9c8fae745d1daa7a852391f1f
diff --git a/metadata/md5-cache/app-text/pep-2.8 b/metadata/md5-cache/app-text/pep-2.8
index 4afc71284759..ab6d36ef7453 100644
--- a/metadata/md5-cache/app-text/pep-2.8
+++ b/metadata/md5-cache/app-text/pep-2.8
@@ -6,5 +6,5 @@ KEYWORDS=~mips ppc sparc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://folk.uio.no/gisle/enjoy/pep28.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ddc8f17394c7f6518d4ef809f7c8161f
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=121a737c7789c4e9b9a401ce4f76f110
diff --git a/metadata/md5-cache/app-text/t1utils-1.37 b/metadata/md5-cache/app-text/t1utils-1.37
index 5a424c531772..caebe0a45e0e 100644
--- a/metadata/md5-cache/app-text/t1utils-1.37
+++ b/metadata/md5-cache/app-text/t1utils-1.37
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Type 1 Font utilities
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.37.tar.gz
-_md5_=fc10106d1acd677ef4f38db3a5c79911
+_md5_=80b4b44e851845de536928dd8afe6363
diff --git a/metadata/md5-cache/app-text/trang-20091111 b/metadata/md5-cache/app-text/trang-20091111
index 20dd527c49f4..87d6ea4353a8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ecd94d5224f50ee42ee9f64f8a2f8cd9
diff --git a/metadata/md5-cache/app-text/wv-1.2.9 b/metadata/md5-cache/app-text/wv-1.2.9
index 7f2e7692f528..4e1627f4b8b5 100644
--- a/metadata/md5-cache/app-text/wv-1.2.9
+++ b/metadata/md5-cache/app-text/wv-1.2.9
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2 >=gnome-extra/libgsf-1.13 sys-libs/zlib media-libs/lib
 SLOT=0
 SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=61c52d251a68aabfff87bf17bc2723a9
+_md5_=edef1c7cbf5459bc739a973f74666679
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r1 b/metadata/md5-cache/app-text/wv-1.2.9-r1
index 40b4ab29bcc1..54c193ae89bd 100644
--- a/metadata/md5-cache/app-text/wv-1.2.9-r1
+++ b/metadata/md5-cache/app-text/wv-1.2.9-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2 >=gnome-extra/libgsf-1.13 sys-libs/zlib media-libs/lib
 SLOT=0
 SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2babac98f9bd15a1aa805e1b189681e9
+_md5_=b9c0de14e1d64bee4cc12cfd2d18155f
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 62c4221b9054..ab4cfeb6d0f1 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
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed72526807269c2f05de81a3c495f314
diff --git a/metadata/md5-cache/app-xemacs/gentoo-syntax-1.19 b/metadata/md5-cache/app-xemacs/gentoo-syntax-1.19
index 1b0266f0206c..aec67c22c9e7 100644
--- a/metadata/md5-cache/app-xemacs/gentoo-syntax-1.19
+++ b/metadata/md5-cache/app-xemacs/gentoo-syntax-1.19
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
 DESCRIPTION=An Emacs mode for editing ebuilds and other Gentoo specific files.
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/index.xml
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-syntax-1.19.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xemacs-elisp	8ab994fcd917bc9759563d867c6dc0f5	xemacs-elisp-common	75b52d66389a113a625dc01850455a9c
-_md5_=743a969a7815e2edd4a89dbf47f2114b
+_md5_=a922b78cc2064389e2ee07e3f4acefa4
diff --git a/metadata/md5-cache/dev-cpp/ETL-0.04.15 b/metadata/md5-cache/dev-cpp/ETL-0.04.15
index 49a1402c4ae0..2e99527707ba 100644
--- a/metadata/md5-cache/dev-cpp/ETL-0.04.15
+++ b/metadata/md5-cache/dev-cpp/ETL-0.04.15
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=ETL is a multi-platform class and template library
 EAPI=4
 HOMEPAGE=http://synfig.org
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/synfig/ETL/0.04.15/ETL-0.04.15.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=3a1d056d6e6f4f388c97d80a9c3183f7
+_md5_=4c14a64f00e920f2707d8d73f40be81f
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.0.297 b/metadata/md5-cache/dev-cpp/tbb-4.0.297
index f708a20966e6..01c78ab17094 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.0.297
+++ b/metadata/md5-cache/dev-cpp/tbb-4.0.297
@@ -8,4 +8,4 @@ LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://www.threadingbuildingblocks.org/uploads/78/181/4.0%20update%203/tbb40_297oss_src.tgz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cae1ad117075d8957693fe23f1bbdf2f
+_md5_=e1584b9df2cc865f51a566abd972cbf0
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index 14234b3108d5..7267b803d54c 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e41e2d3b6d7212a551bf06dfc90eec91
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
index ca8c1829d3fe..5d1d3ca9ce91 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-2.2.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5c5b19b0e2489afb5f4a5b81758b5f53
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
index 9cb0acaa81df..e25a65ef3c94 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-2.2.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7226bbd31e31d19ddae419897ceb3b20
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
index bceba9437758..8bcd42ccf082 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.startnet.biz/download/apgdiff-2.3-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fc58413b7cabf66f4fb1e6e59242d95
diff --git a/metadata/md5-cache/dev-db/cdb-0.75-r2 b/metadata/md5-cache/dev-db/cdb-0.75-r2
index f9366945f3be..a0db2a3a6b23 100644
--- a/metadata/md5-cache/dev-db/cdb-0.75-r2
+++ b/metadata/md5-cache/dev-db/cdb-0.75-r2
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 SLOT=0
 SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c9c1be2b1e1f8ba4cc2e55511e117d5f
+_md5_=356de7b36c01da2c1410b284d7bfb38e
diff --git a/metadata/md5-cache/dev-db/cdb-0.75-r3 b/metadata/md5-cache/dev-db/cdb-0.75-r3
index 4a31f0f76317..209cdfae53ca 100644
--- a/metadata/md5-cache/dev-db/cdb-0.75-r3
+++ b/metadata/md5-cache/dev-db/cdb-0.75-r3
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 SLOT=0
 SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1cb95260d2c6b7abb9c3c716de127e6f
+_md5_=86d887b285fb8f903b3da90d0e57b48d
diff --git a/metadata/md5-cache/dev-db/couchdb-1.1.1 b/metadata/md5-cache/dev-db/couchdb-1.1.1
index 5ac27a9af94a..e362497d5b81 100644
--- a/metadata/md5-cache/dev-db/couchdb-1.1.1
+++ b/metadata/md5-cache/dev-db/couchdb-1.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/icu-4.3.1 dev-lang/erlang[ssl] >=dev-libs/openssl-0.9.8j >=ne
 SLOT=0
 SRC_URI=mirror://apache/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8e0ce32bdc15a0250b7e48f34d8a4c19
+_md5_=c420bdd3a2f0d0fd1df82745a3f43677
diff --git a/metadata/md5-cache/dev-db/couchdb-1.2.0 b/metadata/md5-cache/dev-db/couchdb-1.2.0
index 67e2a98028e6..db233b332a76 100644
--- a/metadata/md5-cache/dev-db/couchdb-1.2.0
+++ b/metadata/md5-cache/dev-db/couchdb-1.2.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/icu-4.3.1 dev-lang/erlang[ssl] >=dev-libs/openssl-0.9.8j >=ne
 SLOT=0
 SRC_URI=mirror://apache/couchdb/releases/1.2.0/apache-couchdb-1.2.0.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4f8d67b59d47f21a333a48a732b7bd7f
+_md5_=5f8bb3e706c803498b7d9253d76fa6b3
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 73fdef23624b..92f71db38dcc 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e309e8659699b9b1183b1fafc61db21
diff --git a/metadata/md5-cache/dev-db/drizzle-7.0.2011.03.13 b/metadata/md5-cache/dev-db/drizzle-7.0.2011.03.13
index a7dc2dc7502c..1d015226a14e 100644
--- a/metadata/md5-cache/dev-db/drizzle-7.0.2011.03.13
+++ b/metadata/md5-cache/dev-db/drizzle-7.0.2011.03.13
@@ -10,4 +10,4 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-
 SLOT=0
 SRC_URI=http://launchpad.net/drizzle/7.0/2011-03-14/+download/drizzle7-2011.03.13.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6860d20548d2e9918453233af1dcb434
+_md5_=fdf1a9a791a5daf014e95cd4c5b829b7
diff --git a/metadata/md5-cache/dev-db/drizzle-7.1.33 b/metadata/md5-cache/dev-db/drizzle-7.1.33
index 70ec9e9eac75..adc49efe0b80 100644
--- a/metadata/md5-cache/dev-db/drizzle-7.1.33
+++ b/metadata/md5-cache/dev-db/drizzle-7.1.33
@@ -10,4 +10,4 @@ RDEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-
 SLOT=0
 SRC_URI=http://launchpad.net/drizzle/7.1/7.1.33/+download/drizzle-7.1.33-stable.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f69ac4ace1e34617cd1f5a2a1e25233d
+_md5_=372de1c95ee5e860dc0786af29851dd5
diff --git a/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6 b/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
index 5de56cf256b7..b6dbf1bed771 100644
--- a/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
+++ b/metadata/md5-cache/dev-db/firebird-2.0.3.12981.0-r6
@@ -10,4 +10,4 @@ RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.0.3.12981-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=142939b2a613a0f43a392597b00357fc
+_md5_=b6b92e4bd191bb45557fde5b447972e4
diff --git a/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0 b/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0
index e24e029f8309..72f7c1d71662 100644
--- a/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0
+++ b/metadata/md5-cache/dev-db/firebird-2.1.3.18185.0
@@ -10,4 +10,4 @@ RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.1.3.18185-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=459e5eb7409cb9c99946692342b5f10d
+_md5_=5d5d9c941e62492dc28f0d66cf49fc56
diff --git a/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0 b/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0
index 77e83c71fa83..03009a855a03 100644
--- a/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0
+++ b/metadata/md5-cache/dev-db/firebird-2.5.1.26351.0
@@ -11,4 +11,4 @@ RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Firebird-2.5.1.26351-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b124bc8c5af7e5afc60773326f89b94f
+_md5_=7bc8c8cf2104a03beaa7f8691fcce1e0
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.7-r1 b/metadata/md5-cache/dev-db/henplus-0.9.7-r1
index faa086bc44bd..753b8ef7fb05 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.7-r1
+++ b/metadata/md5-cache/dev-db/henplus-0.9.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3 =dev-java/commons-cli-1* dev-java/libreadline-java >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.7.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6559eecfef63fef82fef2f26788343da
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8 b/metadata/md5-cache/dev-db/henplus-0.9.8
index 796183f3cd81..86658508abb1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f538004f5b4398081a7832043f4f93a3
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.2-r1 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.2-r1
index 1493730b2bd5..e160cb85d614 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.2-r1
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 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=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fa6506e1069777358e4a9ec112832421
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=25c588c9488d720e6162b437a47a3917
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 ac30e6026c93..895f5063da67 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
 RDEPEND=>=virtual/jre-1.6 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=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=84889c27484db63e1cf99b38ba58dc8a
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b4c92dd2c2529338d6b07da11a09ffd5
diff --git a/metadata/md5-cache/dev-db/jxtray-0.5-r4 b/metadata/md5-cache/dev-db/jxtray-0.5-r4
index c882596afcc0..e71ea517dc31 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 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=mirror://sourceforge/jxtray/jxtray-src-0.5.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b4a12a41cadfba016529d0d96e5873c
diff --git a/metadata/md5-cache/dev-db/mongodb-1.8.4-r1 b/metadata/md5-cache/dev-db/mongodb-1.8.4-r1
index c7146ca3c35a..593d7c813ae7 100644
--- a/metadata/md5-cache/dev-db/mongodb-1.8.4-r1
+++ b/metadata/md5-cache/dev-db/mongodb-1.8.4-r1
@@ -11,4 +11,4 @@ RDEPEND=!v8? ( =dev-lang/spidermonkey-1.8.2* ) v8? ( dev-lang/v8 ) dev-libs/boos
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r1.8.4.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=db9d17e49be907b534e33a4ef57aaa94
+_md5_=ea2d2ec29b062f588eca962a67619350
diff --git a/metadata/md5-cache/dev-db/mongodb-2.0.4 b/metadata/md5-cache/dev-db/mongodb-2.0.4
index 895318ae8a0c..a0ec3799a114 100644
--- a/metadata/md5-cache/dev-db/mongodb-2.0.4
+++ b/metadata/md5-cache/dev-db/mongodb-2.0.4
@@ -11,4 +11,4 @@ RDEPEND=!v8? ( <dev-lang/spidermonkey-1.8[unicode] ) v8? ( dev-lang/v8 ) dev-lib
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r2.0.4.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1cd77468500b87d0c55cb396744d7d61
+_md5_=21f2a9de6532c7deaf8f2481d91f84d3
diff --git a/metadata/md5-cache/dev-db/mongodb-2.0.5 b/metadata/md5-cache/dev-db/mongodb-2.0.5
index 08f2241e1127..d4491943cca7 100644
--- a/metadata/md5-cache/dev-db/mongodb-2.0.5
+++ b/metadata/md5-cache/dev-db/mongodb-2.0.5
@@ -11,4 +11,4 @@ RDEPEND=!v8? ( <dev-lang/spidermonkey-1.8[unicode] ) v8? ( dev-lang/v8 ) dev-lib
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r2.0.5.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20120514-10gen-mms-agent.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=00790bd311df5d5946ba17b382baf0ba
+_md5_=b48907f714e39443b0c92ad20b4b923b
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 3d79469fa54c..47294e451115 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ae976b9c494f0f6af9afaea92ab3c6ef
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
index 452145b56d8c..3ec0ba154bc9 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-basic-linux32-10.2.0.3-20061115.zip instantclient-sdk-linux32-10.2.0.3-20061115.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=03993163c69b799f5f40066c273cece1
+_md5_=cabcf50ca07323da9f301321e1c3f03a
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
index 839db43d227f..176c1dd60c4a 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-basic-linux32-11.2.0.2.0.zip instantclient-sdk-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-basic-linux-x86-64-11.2.0.2.0.zip instantclient-sdk-linux-x86-64-11.2.0.2.0.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=df3c2894af64af9fe3431f62d9cf8d78
+_md5_=4d8a76b38f177260d926d047f9410f08
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3
index 66646f86911f..ca7d6b74cd3d 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-10.2.0.3
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( instantclient-jdbc-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-jdbc-linux32-10.2.0.3-20061115.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=15a1b70382ace233109299188af26b1e
+_md5_=c29a3359e52df4b923c84c61c4e6a216
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
index d01d21a4c559..9fdc6e2673bb 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.2
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-jdbc-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-jdbc-linux-x86-64-11.2.0.2.0.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b75070d89fe4123f2259d126ba009091
+_md5_=f31f233ed4676303923e924ee4c06516
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
index 5a466670c782..f569efb89de1 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
@@ -11,4 +11,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-jdbc-linux-11.2.0.3.0.zip ) amd64? ( instantclient-jdbc-linux.x64-11.2.0.3.0.zip multilib? ( instantclient-jdbc-linux-11.2.0.3.0.zip ) )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f0371e9db46784a8984896d9ebbff287
+_md5_=1a4bab00fe175b33e2959353feb7b6a9
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
index db8eb7e18f5c..33323d450114 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-odbc-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-odbc-linux-x86-64-11.2.0.2.0.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e56ded0dee98161a896ef2cf8701edce
+_md5_=32cef2cd9a28a8312529aed633d4b78b
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
index 5ea54dd17827..113e217bafe3 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
@@ -11,4 +11,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-odbc-linux-11.2.0.3.0.zip ) amd64? ( instantclient-odbc-linux.x64-11.2.0.3.0.zip multilib? ( instantclient-odbc-linux-11.2.0.3.0.zip ) )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9e6f90368f7b4175dfcf139a1dfdfa52
+_md5_=bd7e00cdbcf8fc871de52918ee056d49
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3
index 07c4e0d6f133..2a97b056ae36 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-10.2.0.3
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( instantclient-sqlplus-linux-x86-64-10.2.0.3-20070103.zip ) x86? ( instantclient-sqlplus-linux32-10.2.0.3-20061115.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1b112751a9eef00151248d25044bf3ad
+_md5_=dda96444bae7d06d65e46a9a865c0219
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2
index 7aafe0350b14..46bd00f53d2a 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.2
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-sqlplus-linux32-11.2.0.2.0.zip ) amd64? ( instantclient-sqlplus-linux-x86-64-11.2.0.2.0.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=09a2a2783383e28983a118bec6335a0e
+_md5_=e4030667b18e2f762e182a1a89a60889
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
index 4aa134413c67..17478d0584f2 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
@@ -10,4 +10,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.3.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.3.0.zip )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2973f365a4cf156c4a7a63657863230f
+_md5_=4c048dced9152570497d8347aa6c2035
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.4.2 b/metadata/md5-cache/dev-db/pgbouncer-1.4.2
index 9d9e2ebdb110..e493b9ed3868 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.4.2
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.4.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/projects/pgFoundry/pgbouncer/pgbouncer-1.4.2.tgz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=20ec2aff103a79d148b911ff4dd05489
+_md5_=1b88a9dc1307ce27add4aa4fc25a4186
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.5 b/metadata/md5-cache/dev-db/pgbouncer-1.5
index 83be1386de20..06e653e43841 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.5
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.5
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/projects/pgFoundry/pgbouncer/pgbouncer-1.5.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=32ad09cb4765204c30ba94c8702815fc
+_md5_=7f0d2766dded7e44cfb9bf03a9c891ed
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.5.1 b/metadata/md5-cache/dev-db/pgbouncer-1.5.1
index 6effb958ad4e..6a57976c0480 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.5.1
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.5.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/projects/pgFoundry/pgbouncer/pgbouncer-1.5.1.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=39d0c83eb7d0aa5d454fa8d37e2d3781
+_md5_=40334371c38ae12a968af11dbde7b2ff
diff --git a/metadata/md5-cache/dev-db/postgis-1.3.6-r1 b/metadata/md5-cache/dev-db/postgis-1.3.6-r1
index d575d35af8e9..e5dde295e02f 100644
--- a/metadata/md5-cache/dev-db/postgis-1.3.6-r1
+++ b/metadata/md5-cache/dev-db/postgis-1.3.6-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://postgis.refractions.net/download/postgis-1.3.6.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=327944c07f6665f491f0db90857aa45e
+_md5_=86166d724549ba86100775c50b3e19ee
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.3.18 b/metadata/md5-cache/dev-db/postgresql-server-8.3.18
index 635f2aaed476..8b5cd029183b 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.3.18
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.3.18
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-8.3.18:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.
 SLOT=8.3
 SRC_URI=mirror://postgresql/source/v8.3.18/postgresql-8.3.18.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3577a80a8d25685ce252b1d72523be64
+_md5_=0fa1564d70445e500b289506a3a1a2fd
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.4.11 b/metadata/md5-cache/dev-db/postgresql-server-8.4.11
index 3ce838a3b508..19871eb161cb 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.11
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.11
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-8.4.11:8.4[pam?,pg_legacytimestamp=,nls=] perl?
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.11/postgresql-8.4.11.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=137405e0b3f37590ea4b33ec035704df
+_md5_=a22f6592d526938488a789119f9a2591
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.0.7 b/metadata/md5-cache/dev-db/postgresql-server-9.0.7
index 65f8fd879ebf..16434883745e 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.7
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.7
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.0.7:9.0[pam?,pg_legacytimestamp=,nls=] perl? (
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.7/postgresql-9.0.7.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0cc475b2573dcf38d8210859b9ebd8a5
+_md5_=26c27a2384d45be0ff5a7b60328ee5de
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.1.3 b/metadata/md5-cache/dev-db/postgresql-server-9.1.3
index 13d5bdc70b88..c552ac381ae8 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.3
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.3
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.1.3:9.1[pam?,pg_legacytimestamp=,nls=] perl? (
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.3/postgresql-9.1.3.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c2f6a4a7c95e14a48167daf55cc3210c
+_md5_=9d0db13f8350062c05eb9b9c2d90bf9e
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1 b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
index 7d352b2f59e3..b8761b576bcc 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.2.0_beta1:9.2[pam?,pg_legacytimestamp=,nls=] p
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.0beta1/postgresql-9.2beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f6337a7d60612ed8ad0b4faade25a78b
+_md5_=e0aef326c97366cf33b7d14f4424890c
diff --git a/metadata/md5-cache/dev-db/redis-2.4.10 b/metadata/md5-cache/dev-db/redis-2.4.10
index 2b82d77bb3e7..d2e03fb61eaf 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.10
+++ b/metadata/md5-cache/dev-db/redis-2.4.10
@@ -10,4 +10,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.10.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3810306705fc69de74b863c8594eabbf
+_md5_=e7dfe40d61e037190ddadf1022a3089c
diff --git a/metadata/md5-cache/dev-db/redis-2.4.13 b/metadata/md5-cache/dev-db/redis-2.4.13
index ceda63c1e8e5..e2a609716a36 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.13
+++ b/metadata/md5-cache/dev-db/redis-2.4.13
@@ -10,4 +10,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.13.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=abfe52b15b3a6e3854a9e4190c2c0c96
+_md5_=5021586e810c8ca6592be2e25369a0a9
diff --git a/metadata/md5-cache/dev-db/redis-2.4.14 b/metadata/md5-cache/dev-db/redis-2.4.14
index 5dcf880d6c8b..93871c01e586 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.14
+++ b/metadata/md5-cache/dev-db/redis-2.4.14
@@ -10,4 +10,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.14.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=14a7f3aca0e69da9857505dd957d3bc3
+_md5_=e1ce52e444dbb43e8d7e5b309e0ce9b1
diff --git a/metadata/md5-cache/dev-db/redis-2.4.4-r1 b/metadata/md5-cache/dev-db/redis-2.4.4-r1
index 1794275f348d..316b3ec6da28 100644
--- a/metadata/md5-cache/dev-db/redis-2.4.4-r1
+++ b/metadata/md5-cache/dev-db/redis-2.4.4-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
 SLOT=0
 SRC_URI=http://redis.googlecode.com/files/redis-2.4.4.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=639677c898ea5df8660a26b4052fe807
+_md5_=ee048b5ac365d6043a01b274bff29ec5
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-1.5.4.59.40 b/metadata/md5-cache/dev-db/sqldeveloper-1.5.4.59.40
index 022d11c0591c..d2369555de6b 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-1.5.4.59.40
+++ b/metadata/md5-cache/dev-db/sqldeveloper-1.5.4.59.40
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5.0 mssql? ( dev-java/jtds:1.2 ) mysql? ( dev-java/jdbc-
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-1.5.4.59.40-no-jre.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec4369a17c99558c7b77727975860b8f
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-2.1.1.64.45 b/metadata/md5-cache/dev-db/sqldeveloper-2.1.1.64.45
index 3003470d8ee2..3f394f21fbf1 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-2.1.1.64.45
+++ b/metadata/md5-cache/dev-db/sqldeveloper-2.1.1.64.45
@@ -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-2.1.1.64.45-no-jre.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a648aa87d537d2c47f5f466644e6a868
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-3.0.04.34 b/metadata/md5-cache/dev-db/sqldeveloper-3.0.04.34
index 99aaa8963d3f..1ab7a862f29f 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-3.0.04.34
+++ b/metadata/md5-cache/dev-db/sqldeveloper-3.0.04.34
@@ -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.0.04.34-no-jre.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea8a21e0e527be196d9657303cf6b55a
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-3.1.07.42 b/metadata/md5-cache/dev-db/sqldeveloper-3.1.07.42
index 84996dd598c8..b192dc798860 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-3.1.07.42
+++ b/metadata/md5-cache/dev-db/sqldeveloper-3.1.07.42
@@ -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.1.07.42-no-jre.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b4be254a032abb76193e9e4be0203dac
diff --git a/metadata/md5-cache/dev-db/sqlite-2.8.16-r5 b/metadata/md5-cache/dev-db/sqlite-2.8.16-r5
index 710f057e9aae..d49e3633a43b 100644
--- a/metadata/md5-cache/dev-db/sqlite-2.8.16-r5
+++ b/metadata/md5-cache/dev-db/sqlite-2.8.16-r5
@@ -10,4 +10,4 @@ RESTRICT=!tcl? ( test )
 SLOT=0
 SRC_URI=http://www.sqlite.org/sqlite-2.8.16.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1185209828ac8f43a9564f91cbcbaf28
+_md5_=670c1b4ca356cf6e9963624e4c29e626
diff --git a/metadata/md5-cache/dev-db/sqliteodbc-0.87 b/metadata/md5-cache/dev-db/sqliteodbc-0.87
index 1f26f971de3d..3f1b41526135 100644
--- a/metadata/md5-cache/dev-db/sqliteodbc-0.87
+++ b/metadata/md5-cache/dev-db/sqliteodbc-0.87
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.6 || ( >=dev-db/unixODBC-2.2 >=dev-db/libiodbc-3.5 )
 SLOT=0
 SRC_URI=http://www.ch-werner.de/sqliteodbc/sqliteodbc-0.87.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f89e36cdaef35be31dc220ba560f9727
+_md5_=e1a77248682b990d33d3bba52551409f
diff --git a/metadata/md5-cache/dev-db/sqliteodbc-0.94 b/metadata/md5-cache/dev-db/sqliteodbc-0.94
index 14bbb6a2430e..a0177bb90780 100644
--- a/metadata/md5-cache/dev-db/sqliteodbc-0.94
+++ b/metadata/md5-cache/dev-db/sqliteodbc-0.94
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.6 || ( >=dev-db/unixODBC-2.2 >=dev-db/libiodbc-3.5 )
 SLOT=0
 SRC_URI=http://www.ch-werner.de/sqliteodbc/sqliteodbc-0.94.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1a94ba5fedccc24d14df85631abd6db1
+_md5_=9811f95830091e9e0c1aca502815c9fd
diff --git a/metadata/md5-cache/dev-db/tinycdb-0.77-r2 b/metadata/md5-cache/dev-db/tinycdb-0.77-r2
index 12680b39f67f..354226036e59 100644
--- a/metadata/md5-cache/dev-db/tinycdb-0.77-r2
+++ b/metadata/md5-cache/dev-db/tinycdb-0.77-r2
@@ -3,11 +3,11 @@ DESCRIPTION=TinyCDB is a very fast and simple package for creating and reading c
 EAPI=4
 HOMEPAGE=http://www.corpit.ru/mjt/tinycdb.html
 IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=!dev-db/cdb
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ae963dcb5186e1918d5929f0cb6954c8
+_md5_=f34dd6d0c43a0ba5cce56edaad953713
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 692f689ab961..60ce6ef1b02c 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60a749c09fc450cb142757831c9169bc
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 a8b1232db3b0..b3c212b324eb 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fbf2b5ec931b512054bb8e6a19f513a4
diff --git a/metadata/md5-cache/dev-dotnet/log4net-1.2.10-r3 b/metadata/md5-cache/dev-dotnet/log4net-1.2.10-r3
index f9d40a1dd588..45ee3d76e2bf 100644
--- a/metadata/md5-cache/dev-dotnet/log4net-1.2.10-r3
+++ b/metadata/md5-cache/dev-dotnet/log4net-1.2.10-r3
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/mono-2.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/log4net/log4net_1.2.10+dfsg.orig.tar.gz -> log4net-1.2.10.tar.gz http://dev.gentoo.org/~pacho/dotnet/log4net.snk
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4a27db1c3da374bdba16bef1232f495b
+_md5_=9a5bbf93cc25d5daea675dba387ca8b4
diff --git a/metadata/md5-cache/dev-dotnet/log4net-1.2.11 b/metadata/md5-cache/dev-dotnet/log4net-1.2.11
index 48fd6e6a6ba6..78c8cf40f99d 100644
--- a/metadata/md5-cache/dev-dotnet/log4net-1.2.11
+++ b/metadata/md5-cache/dev-dotnet/log4net-1.2.11
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/mono-2.0
 SLOT=0
 SRC_URI=mirror://apache/logging/log4net/source/log4net-1.2.11-src.zip http://dev.gentoo.org/~pacho/dotnet/log4net.snk
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3a60fecc94b7bcd9fde29baddba68ec9
+_md5_=f43c66e5b45a3384c3bf37beb4dca06c
diff --git a/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2 b/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
index be799dfe1795..5c2a71a310ff 100644
--- a/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
+++ b/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
@@ -8,4 +8,4 @@ RDEPEND=>=dev-lang/mono-1.2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/monocalendar/monocalendar-source-0.7.2.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b59dd47b6ffdc11ef924d597d143fccc
+_md5_=464ac88c81ee20c9eff4018b758893ba
diff --git a/metadata/md5-cache/dev-dotnet/xsp-2.10.2 b/metadata/md5-cache/dev-dotnet/xsp-2.10.2
index 9daa991eb508..2e349fa9debc 100644
--- a/metadata/md5-cache/dev-dotnet/xsp-2.10.2
+++ b/metadata/md5-cache/dev-dotnet/xsp-2.10.2
@@ -9,4 +9,4 @@ RDEPEND=dev-db/sqlite:3 =dev-lang/mono-2.10*
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=70b0174f7fda9ca48d9af00f4e072ac8
+_md5_=b587edd22494975112ea58fda5e6a8a6
diff --git a/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r1 b/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r1
index 8ac632ebc690..43186b6c1f2a 100644
--- a/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r1
+++ b/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-db/sqlite:3 =dev-lang/mono-2.10*
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	go-mono	062f25a198b23a53e074c32c867cc97e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5831bd0223a0d655fa62a81e2ddbb62c
+_md5_=3bc9ce8ccc5ba14b7030cfec538a5eec
diff --git a/metadata/md5-cache/dev-embedded/scratchbox-1.0.19 b/metadata/md5-cache/dev-embedded/scratchbox-1.0.19
index 547682085032..0e46d30952a4 100644
--- a/metadata/md5-cache/dev-embedded/scratchbox-1.0.19
+++ b/metadata/md5-cache/dev-embedded/scratchbox-1.0.19
@@ -7,4 +7,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-1.0.19-i386.tar.gz http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-1.0.19-i386.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b0302c7f2bbc2b8c63e9527325e0bc14
+_md5_=77d3f50214fe3ca588d901580a446177
diff --git a/metadata/md5-cache/dev-embedded/scratchbox-1.0.20 b/metadata/md5-cache/dev-embedded/scratchbox-1.0.20
index 8269c45090fc..83d1f7e45bb6 100644
--- a/metadata/md5-cache/dev-embedded/scratchbox-1.0.20
+++ b/metadata/md5-cache/dev-embedded/scratchbox-1.0.20
@@ -7,4 +7,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-1.0.20-i386.tar.gz http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-1.0.20-i386.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f20157af82248d51ee74ef9e89c58eff
+_md5_=fe5ae7ce7318a88c224e0d7d209319e2
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.0.1 b/metadata/md5-cache/dev-games/openscenegraph-3.0.1
index 7e1e624cbc64..4d5359676639 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.0.1
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.0.1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-m
 SLOT=0
 SRC_URI=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/OpenSceneGraph-3.0.1.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=981b61c99c39e78e78cd220afdb26bf1
+_md5_=bc428d8f032bae3f3c1ad44dfd0b43aa
diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta
index 3950ff3b4a0f..e0c4cef857eb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2f81db8aa3831ee39fd68a32107a08a
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.7.1-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.7.1-r1
index 97f7e7b622bd..cbb01ac43549 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.7.1-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.7.1-r1
@@ -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.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d47b907de104042ea63e99d6513de78b
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.8.0 b/metadata/md5-cache/dev-java/ant-antlr-1.8.0
index fa7fd3ad5141..fba77e3be1fb 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.8.0
@@ -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.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ae419cc3c0a0d05847644abdd1df58b
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.8.1 b/metadata/md5-cache/dev-java/ant-antlr-1.8.1
index d38a599c7092..9e512315c7ab 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.8.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.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31f93be8d45ab70fcafc44cded6f3af4
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 43f262cc41a6..b79a8aad6ae7 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 6c61af879940..281d2ebeaf0e 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=365878d818351b30d707fb0de38210b6
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.7.1 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.7.1
index cfdc6f682eb9..c2bea7754d16 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/ant-nodeps-1.7.1 >=dev-java/bcel-5.1-r3:0 >=dev-java/java-conf
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49e7b3f03aa148de38e9b5f1577f541f
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.0
index bcc5248dda80..bf90d8bd0fb5 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/ant-nodeps-1.8.0 >=dev-java/bcel-5.1-r3:0 >=dev-java/java-conf
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08abbb91607ae8a1ea3625134508ee29
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.1
index 872915589740..33c205452476 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-java/ant-nodeps-1.8.1 >=dev-java/bcel-5.1-r3:0 >=dev-java/java-conf
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8faa06e4bac22a25ca7f102a16ee8178
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 06be3e145457..3cab445ef36f 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 c15a53d77438..fb95681c6ef9 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a068c8e856bae3e26455b1324e5a364
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.7.1-r1 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.7.1-r1
index cdfe4d3acbb5..7675e3572b7d 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.7.1-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] ~dev-java/ant-node
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f10c75cf16d69a5dbfec2a0b94372f3
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.0
index 435ac0fb5629..93fe2ed93191 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] ~dev-java/ant-node
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c608a518e53d83a99b7bd5b784fabb05
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.1
index 5fbfd6347652..6c7ad6ec86a5 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] ~dev-java/ant-node
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=772acd5622aaaefbcac7a50d77eb3bd2
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 124ca48abc63..4e1c38a9a4ee 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 55416eb068ff..38cd91ec39c1 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25fedf29f752a46708e62fa1d4064ba9
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.7.1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.7.1
index ae3038c9461c..bf2058d153b6 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=090f7075776b03f8db6137a9b10f3fa3
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.0
index f681bcd0bb7c..4992daf1ec16 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d46f14225130451c4ef1a12d7014240b
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.1
index fc8dff923ab1..057ed99a713c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5046f7d8ec1972ada593e18061c32181
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 f5484dcfcb76..0d79c49aee87 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f899d1f89697..bf87e5658c1b 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5cb2ca6161d69c55a90b159aab45661c
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.7.1 b/metadata/md5-cache/dev-java/ant-apache-oro-1.7.1
index d44ede088cf4..e52c0531863f 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.1.9-r1 >=sy
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc63a9777cf937f47a64da674e8d7f77
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.0
index 3c2618f86615..55b8acea647e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.1.9-r1 >=sy
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c07ad2ab0dd7665d052c1199328e06c
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.1
index 759ae865e574..1a69da077451 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.1.9-r1 >=sy
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6510f4510136b113b75fdeccb4dfc61f
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 b7f7fd2e356b..9efbf4e56abb 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 c29af1de78fc..a0327ac79bf3 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=512968bf80325b230647a0e14a842a0d
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.7.1 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.7.1
index 4e69e59aae2b..dac26642655e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.1.9-r1 >=s
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab776f14f96eef913b7503d1db79a01a
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.0
index 45177bfb9898..28858be7b07c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.1.9-r1 >=s
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4b31bbe8caff5d70cef9fce452945f2b
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.1
index 67a85d28d6c4..77e2ca4e6841 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.1.9-r1 >=s
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a57db1fd727c020fecdaf6bba2464970
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 b7a96696a9d0..06c26d67d5bc 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a537e4af5cce..eb5ab9d26649 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1c9475726ee6b6252dc77f4987179737
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.7.1 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.7.1
index 4876cee5318a..e1f358d8851d 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebec50bd14822c5634ee04e02147e6ba
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.0
index 490990e67d06..dd4b6a4ca7f7 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=101905063478cc2b8184e9882c2daef8
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.1
index f9d6831c4811..0e7bdaefd7f9 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=673f96ec7ff214d4da018f9ec492b288
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 f0c1b58d9f41..cad92e45e38f 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 71b8f17018cd..9a6838415b6a 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52f436631ed0a6010ba4a998bfbbd943
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.0 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.0
index bc4174ca75e4..655b16eefe86 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan ~dev-java/ant-trax-1.8.0 >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1fe39cefed74f9094112ffe81b041e14
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.1
index 0f8bba9799cc..1a2b9d7a02e6 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan ~dev-java/ant-trax-1.8.1 >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3fda20ea192d6c2b2cf45386c1e91235
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 5a3bb60fe9f3..9a2e946315e5 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 270590f9bd60..a621ec19fb31 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c48c30912a09af693d64becb1bdf0cc0
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.7.1 b/metadata/md5-cache/dev-java/ant-commons-logging-1.7.1
index da2df4893abd..5a96f1c31824 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1b80d81deab38510d251c00e2a9d3a8
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.0 b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.0
index abf52437ab44..6402bc3ac8d0 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45e6dfb977f0df4723402a5f1a529260
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.1 b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.1
index ce17609e6538..07cafb23ac8c 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.1.9-r1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59535e380e1fd05120805337e8fe809c
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 db64a6a75239..76cb810104a5 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 37ab8b85d028..1d38a40a3641 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6a906fe220e97b63d7c94afc96aea0b
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.7.1 b/metadata/md5-cache/dev-java/ant-commons-net-1.7.1
index 97d28bc92b96..13f9778abb7f 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=546733cdaa28b72592d09cb6ef9b6170
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.8.0 b/metadata/md5-cache/dev-java/ant-commons-net-1.8.0
index 22c92bdc9ae9..d5ebfddcc8fe 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1f7967367786b041e56b764520a4407
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.8.1 b/metadata/md5-cache/dev-java/ant-commons-net-1.8.1
index 35045134ae19..b387647c8039 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c32024b8356f35431ba03127c64c8f5d
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 04463d98903c..6c6f7b525de9 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f62a241685b4..fe1d9fdbad3b 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc7dfa3145b4ab8f947d4eda02c32086
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 1300ec0591ca..1d65cdf56640 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8869ed18b22a8f3819c6bcd0ab35c31f
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3
index 22094b46ad71..e90a2ae987c1 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8908f1be04f5af81c89c6fe4490f170f
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 a5cb33a67141..4fb759d51960 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a391c88ad3407eb1a2be22b5b813d087
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 8c1282fde4c5..fd9fb5decf17 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6019c354066c7d8c324d07eb616e080
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 ac8b952c00ba..e6a7efd9d57a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dda261f2486e5559c1bd77b1d679e4f4
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 0dc577722d1b..c6b1defe5354 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f08d4b2636488a44859372431e37038
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 7d1456aa8b3a..8ec0f2d824b5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6689779573fd3502e410edff4539c31f
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 6b29dcccae19..5a11f24e7bb0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=904fd07171abd221a428abaa0055e306
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 328c6b25e607..73a4985f71a7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=baafc114bf49c7e039500b90ca16bb58
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 6ef9d3cf4919..3bbc5d57777f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9e8b56446e46..ea50b6f16ee4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 fff377defeab..c8393b2d543c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 d98c0882ac7c..e2023a3844f9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=112ec4d584cc64798b5166d7bc02878b
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 f272171e0dad..7881ac96fb13 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 255e121c1e59..5df50ef3af81 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5dccbc92182e8b570eb26c51a8c814c3
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 cb0add2d7081..04bb24dbd2cf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1483ead62abdfd5dfcaaca0db2c4c7e7
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1
index 73165badd0ba..11ed0be293a2 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/commons-cli-1* =dev-java/commons-httpclient-3* dev-java/commons-vfs =dev-java/jakarta-oro-2.0* dev-java/jsch >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9b32a381968017bf8e45f000ea21d160
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 82cedd6759a0..305be3b63ad9 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 dev-java/jakarta-oro:2.0 dev-java/js
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.0.0/apache-ivy-2.0.0-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47ac5a65529425412799ab5ef7be7994
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.7.1 b/metadata/md5-cache/dev-java/ant-jai-1.7.1
index 41df8062a73e..5ffbab4d2eab 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-jai-1.7.1
@@ -9,5 +9,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.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8a099ca7fab42e40ec9f6a4e8ba6630
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.8.0 b/metadata/md5-cache/dev-java/ant-jai-1.8.0
index 5f7e2e5a9b10..6d882bacfd19 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-jai-1.8.0
@@ -9,5 +9,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.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd8366a8b3defca8ddb541a6d174c217
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.8.1 b/metadata/md5-cache/dev-java/ant-jai-1.8.1
index ef81a5977507..30e753f694c8 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-jai-1.8.1
@@ -9,5 +9,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.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2aff2e418dfdee49b903d8fc997c9d8c
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 f687724cf955..ff968c1db63a 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 806e2759d1ec..699db027c502 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d032d964cd7a9bcd735cb510a6060d0
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.7.1 b/metadata/md5-cache/dev-java/ant-javamail-1.7.1
index 34b74879fa7e..b61e79e8df4f 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail dev-java/sun-jaf >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e90e847ac5f75b14bbc8a2bab4d8133
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.8.0 b/metadata/md5-cache/dev-java/ant-javamail-1.8.0
index 73096ba44bd5..32a79de69abc 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail dev-java/sun-jaf >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31764f1ba51df152b1b6c95b9e3b8c68
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.8.1 b/metadata/md5-cache/dev-java/ant-javamail-1.8.1
index f55d16a7c24e..b650c15e52da 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail dev-java/sun-jaf >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=589e4b89076b8b7c9dcbce6016d0c6dc
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 dde689ed7bbd..bfced7f891a7 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 fafd7a3f0d38..85a5289206b0 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27ce306d011574d707da941ac6a54e5f
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.7.1 b/metadata/md5-cache/dev-java/ant-jdepend-1.7.1
index 4ced68caa26b..839964f2a4a6 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ddb879d7f59f38d0eebd5f9624bfeace
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.8.0 b/metadata/md5-cache/dev-java/ant-jdepend-1.8.0
index 05ca63b7c5c1..e95a5a06fddc 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1bb0ea3db4fe27c19c65fe79f5172f2d
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.8.1 b/metadata/md5-cache/dev-java/ant-jdepend-1.8.1
index 3b6bdf1183f4..1b432ab08d19 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ae2be3b9e65cdfd1457c6bc3b583489
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 37eaedbf7c5b..1c4e1e62ebc1 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ff1cc48585a2..6c64049759c7 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3888805b7d2b4be53e4b490b6a436a00
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.7.1 b/metadata/md5-cache/dev-java/ant-jmf-1.7.1
index dd96911ecab2..cdad6bbcc04f 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.7.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d065574296b0cda370f60dcda8519211
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.8.0 b/metadata/md5-cache/dev-java/ant-jmf-1.8.0
index c986a8910665..90ab693c4805 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.0 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1c4ae4d845d49b2db56bf31d9d7fac9d
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.8.1 b/metadata/md5-cache/dev-java/ant-jmf-1.8.1
index 8c221924ea1a..7303db0e7d0d 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7b2c622396019ffc910df70d8665e0ed
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 0eef5a64cdf4..fe44a499e092 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f059252e1f95f67d7128b7eb078731e
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 c10d080cc7e5..0dff560e5758 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd8c2492447a5962b0945cf9dc68dbb7
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.7.1 b/metadata/md5-cache/dev-java/ant-jsch-1.7.1
index bd8725031181..822db848683d 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/port
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4b5addadd413ca683c0276347cc34478
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.8.0 b/metadata/md5-cache/dev-java/ant-jsch-1.8.0
index acb79e292ce7..21797e60cd6d 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/port
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=586cae46794c35db7929082ef59528f2
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.8.1 b/metadata/md5-cache/dev-java/ant-jsch-1.8.1
index 3798cf13c41a..1916f6442f70 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/port
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b9a65ea93699604f3fd7cbf6f728e53b
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 47e17f90ca9e..7af2af5fe2b7 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a878cd0533d3..36c312bcc938 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=27f2cee834dcdac39702d0ef78f9b31a
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.7.1 b/metadata/md5-cache/dev-java/ant-junit-1.7.1
index 91fc9cb5c8bf..af1b287b03e4 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-junit-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab193656f2d9ec033be2996e9c0a8b2b
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.8.0 b/metadata/md5-cache/dev-java/ant-junit-1.8.0
index 50b9094197d0..1dcb3c5cb276 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-junit-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53da328ee67901ffde0b34bac5cbf924
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.8.1 b/metadata/md5-cache/dev-java/ant-junit-1.8.1
index 2ac20b770b78..4fe83345c938 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-junit-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9646913ff0b47d0242607295a6ee36a2
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 7fa69e496c67..d4d6084968c0 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 aeafab187a3f..c794e9a3481c 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=363b6e5eac3af6f1fa84bf20df4981fe
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.7.1 b/metadata/md5-cache/dev-java/ant-junit4-1.7.1
index 61961a3eec6b..ee7437db0170 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8961283e49598eae1242f018fb3e3ff2
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.8.0 b/metadata/md5-cache/dev-java/ant-junit4-1.8.0
index 7d6444681507..bfa8bd4931f6 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c34e61d48a8417e446783587167cf858
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.8.1 b/metadata/md5-cache/dev-java/ant-junit4-1.8.1
index 2fe2345dae5f..321bc8fd4c41 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66a93393a629ed38b4190020510b7e0d
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 99124c910187..359d378c5d2b 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 29ec96f242ff..e0d3b4f7695f 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fdb3e84a3eee512eebe33eb29648754b
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.7.1 b/metadata/md5-cache/dev-java/ant-nodeps-1.7.1
index de78b10f950b..fc68193aaa7a 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.7.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.7.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33d99c8355a25a7bb0e358a38934a45a
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.8.0 b/metadata/md5-cache/dev-java/ant-nodeps-1.8.0
index 4aee6b4dc098..90d66cf44628 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.8.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.0 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25badd3b84afafc0e18bdefa7061d0e2
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.8.1 b/metadata/md5-cache/dev-java/ant-nodeps-1.8.1
index c08f23d6ae09..1c7cd624ead2 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.8.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d01c54255deefb2c9ae5651fa9b1de3f
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 6bf577c84b0d..fba24fd6413b 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
 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9fbe8452cbc0..19d9d035ecbf 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
 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f0c2129a3b7d0b58d83b6fe5826696a
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 48efdc1c7768..49948f1790fe 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25a5e14111a1cec1ebf00c74dab22b2f
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.7.1 b/metadata/md5-cache/dev-java/ant-swing-1.7.1
index ce227836b80b..9c86344734eb 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-swing-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.7.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=62ac5721ce587ab26ccbed0f8abbb797
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.8.0 b/metadata/md5-cache/dev-java/ant-swing-1.8.0
index 0d8afd572090..aa06b807333a 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-swing-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.0 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=159863701c19e400654395f49167f86b
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.8.1 b/metadata/md5-cache/dev-java/ant-swing-1.8.1
index 95e33000d477..6317f7af0d7c 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-swing-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.1 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e50574e6b47944f38cf83bd63447581d
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 6b6c3a6bb3ad..7d6b405d1e36 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=907c746db472d66b61de4e19c75c7f3e
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 a091afcc3936..82c1ebcd8f9c 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b01bc3c31776a9cd5807a82703c4a03
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.8.0 b/metadata/md5-cache/dev-java/ant-testutil-1.8.0
index 8f1d77c407c0..08fe9e5850bb 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 ~dev-java/ant
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ea2eb392e38ac9979b2b46757294df4
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.8.1 b/metadata/md5-cache/dev-java/ant-testutil-1.8.1
index d840b48bbd52..74e1eed56f13 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 ~dev-java/ant
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4105ad9cf04e338ba9430fb3949b9f0
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 287cab3e5fab..63dafb04ebf2 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 66789b3cca5e..6a40f03ba367 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f84e8fe71e59c46e60f983c7d8989cc7
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.7.1 b/metadata/md5-cache/dev-java/ant-trax-1.7.1
index 629f736ca73d..95078e7ad222 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.7.1
+++ b/metadata/md5-cache/dev-java/ant-trax-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.7.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f75e97692c7fdde0638db872091f4ed
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.8.0 b/metadata/md5-cache/dev-java/ant-trax-1.8.0
index 2fe7299993f0..b241647646d9 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.8.0
+++ b/metadata/md5-cache/dev-java/ant-trax-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 ~dev-java/ant
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.0-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=38b2acce60f65f41af9857b6bf900801
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.8.1 b/metadata/md5-cache/dev-java/ant-trax-1.8.1
index 7c25a475c3a3..60fe807b7dfc 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-trax-1.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 ~dev-java/ant
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2e213c3e01e815e317e1028a2bc2e27
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 e4a3f1e66aca..6796186e9767 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 >=virtual/jre-1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 40e74119118b..1585bd4806e2 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
 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	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=ant-tasks	9d79eaf483900af27bd68c93975e7416	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=da308dc57ee2fc992af99faf3a23e578
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 fe2d367a56a9..91e64dc85f3e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=36322a1b77624b4eee96a2bfbab68f6a
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7 b/metadata/md5-cache/dev-java/antlr-2.7.7
index ffefd1135995..8404b15353b2 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7
@@ -9,5 +9,5 @@ LICENSE=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c51cdc938d6d86c250ab2c0508f759f8
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r1 b/metadata/md5-cache/dev-java/antlr-2.7.7-r1
index e78cc652dc53..f0647417649d 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r1
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r1
@@ -9,5 +9,5 @@ LICENSE=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e2c1830d452b0fe0a1b38dd28e13fb8
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 1ac9ad8a190e..d593febffcf7 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=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52b335ce9b10269c57d019f77c0316de
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r3 b/metadata/md5-cache/dev-java/antlr-2.7.7-r3
index 1c3cbdbbbfe2..8bec229346fb 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r3
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r3
@@ -9,5 +9,5 @@ LICENSE=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33d7e6c40149e095ddd2b73ab4fb168e
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r4 b/metadata/md5-cache/dev-java/antlr-2.7.7-r4
index f779061bc6ac..d5e0a4b7c983 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r4
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r4
@@ -9,5 +9,5 @@ LICENSE=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2d62c68f285cd700d090720961cc83a
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 07fe1bf47ec9..6231b9f11982 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r5
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
@@ -9,5 +9,5 @@ LICENSE=ANTLR
 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	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4047ebdce5347106f03f0a6756d479f6
diff --git a/metadata/md5-cache/dev-java/antlr-3.1.3-r2 b/metadata/md5-cache/dev-java/antlr-3.1.3-r2
index 826b4ad4bb59..1aa96fa74c83 100644
--- a/metadata/md5-cache/dev-java/antlr-3.1.3-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/stringtemplate-3.2 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=42f39db374cfbc3ce3ea480270fdafb9
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r1 b/metadata/md5-cache/dev-java/aopalliance-1.0-r1
index 414996732196..35715a6c2ef7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1095bf430020419227a23aebba3c8742
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r2 b/metadata/md5-cache/dev-java/appframework-1.03-r2
index 80e91efe0272..50f74c5a63bb 100644
--- a/metadata/md5-cache/dev-java/appframework-1.03-r2
+++ b/metadata/md5-cache/dev-java/appframework-1.03-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/swing-worker >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://appframework.dev.java.net/downloads/AppFramework-1.03-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d9e188f806f1d5e7eb5a734f2f6c62d
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.2-r1 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.2-r1
index 6ff3a0c9d45a..1d1964a6a099 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.2-r1
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=Apple
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eda6f5b8f302870969b65e25f6041a96
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.3 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.3
index d022c7dac545..9c224974b5f6 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.3
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.3
@@ -9,5 +9,5 @@ LICENSE=Apple
 RDEPEND=>=virtual/jre-1.3 >=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.3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c3e4790c06cafaac28640b3df5d28b03
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 a34347c2c471..5218a95f2237 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c347b73584ff83d9edce572e1f81c8c
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0 b/metadata/md5-cache/dev-java/apt-mirror-1.0
index 39dc13bfe5cb..5710d9230559 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=118ab16e95a9bc26b852d58cdfd8c786
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 8045b3c31bd0..603cbcb8a9a8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8c010aef6e48e256fd3677b18fa64393
diff --git a/metadata/md5-cache/dev-java/asm-1.5.3 b/metadata/md5-cache/dev-java/asm-1.5.3
index f2b070d1c53c..529fa0dea9e5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24f1828aee0ce850acfabaaedfeacd61
diff --git a/metadata/md5-cache/dev-java/asm-2.0-r1 b/metadata/md5-cache/dev-java/asm-2.0-r1
index d7156911898a..3c6d28b382bf 100644
--- a/metadata/md5-cache/dev-java/asm-2.0-r1
+++ b/metadata/md5-cache/dev-java/asm-2.0-r1
@@ -9,5 +9,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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=704a62de7510bc17f7bba0975f02872f
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 a9058ced22a8..d353f992c3c6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8989b09b2b38e0f85cc05e87f85e225
diff --git a/metadata/md5-cache/dev-java/asm-3.0 b/metadata/md5-cache/dev-java/asm-3.0
index 8629acaf68a6..a7265375993b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2a13efd8e616ff70e92b13a9e8748f9
diff --git a/metadata/md5-cache/dev-java/asm-3.1 b/metadata/md5-cache/dev-java/asm-3.1
index 9b503f356db2..4cfdff27ad81 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f20ed0c366daf9d9863dffea46b5dde
diff --git a/metadata/md5-cache/dev-java/asm-3.2 b/metadata/md5-cache/dev-java/asm-3.2
index 59d8b6bdc3af..add0b29a4a53 100644
--- a/metadata/md5-cache/dev-java/asm-3.2
+++ b/metadata/md5-cache/dev-java/asm-3.2
@@ -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.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edf6c5eb65f98b38f84323efae608473
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1 b/metadata/md5-cache/dev-java/asm-3.3.1
index 9eb2fe1e523f..d20483fd8628 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d01836be2b515a73dffdb93329c84c9a
diff --git a/metadata/md5-cache/dev-java/asm-4.0 b/metadata/md5-cache/dev-java/asm-4.0
index f51f3144ef95..ceab42f9f22f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75c9e42a0f128b7fc4a0eb333be8a0b9
diff --git a/metadata/md5-cache/dev-java/aspectwerkz-2.0 b/metadata/md5-cache/dev-java/aspectwerkz-2.0
index 074b59d437ae..9c4f63aab08c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0f8b9ee6a8feb7009ae2667b7b86872
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 1e3256f8f10a..90bffa291a61 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e130dc5393e25971a655bba2daac1824
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 b5f47178e39e..fa0e0ce4be19 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbca48d8520117c04a3d23812900191f
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 53514769d80a..765df8e4ee23 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=928a3b34b60281122a415480546ab60e
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2 b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2
index 4a80f6e81233..358801bca7d5 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2
+++ b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-framework:4.1 dev-java/sun-jaf:0 dev-java/log4j:0 dev-java/servletapi:2.3 dev-java/sun-javamail:0 dev-java/sun-jms:0 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1c6b8228d8d13c497b49d8d0c06567c
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r4 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r4
index d94b1aca34d7..49b712baa6bf 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r4
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r4
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d862eac9bdd324f916fcbd838c461fa6
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 5433db7027d6..17f7b34b826a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1897d8aaeaa4c41147576a93ab304f48
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 a4b1120c26ce..b88e3cd53ed6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=17913f06d24ebfa488ccebac33c948b3
diff --git a/metadata/md5-cache/dev-java/batik-1.7-r2 b/metadata/md5-cache/dev-java/batik-1.7-r2
index daf6eadc0109..f570b21e65e1 100644
--- a/metadata/md5-cache/dev-java/batik-1.7-r2
+++ b/metadata/md5-cache/dev-java/batik-1.7-r2
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e2bce17c274d46754e3c0c46102e126
diff --git a/metadata/md5-cache/dev-java/bcel-5.2 b/metadata/md5-cache/dev-java/bcel-5.2
index a4e75b45a712..a84418657027 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2
+++ b/metadata/md5-cache/dev-java/bcel-5.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=0
 SRC_URI=mirror://apache/jakarta/bcel/source/bcel-5.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e072d75cbbbad992c4e4e62e18013af
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r1 b/metadata/md5-cache/dev-java/bcel-5.2-r1
index 129c871ad0b5..9122469dee72 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2-r1
+++ b/metadata/md5-cache/dev-java/bcel-5.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-junit =dev-java/junit-4* >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0181f0fbdaad31fbdfc224afc0597805
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r2 b/metadata/md5-cache/dev-java/bcel-5.2-r2
index 3746ff4e5e6d..43d45617db85 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8dbc283c6f533040ddc3623ae3717323
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r1 b/metadata/md5-cache/dev-java/bcmail-1.38-r1
index e2a7e0e0165a..afa5f146ddb8 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 ~dev-java/bcprov-1.38:0 =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=0
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b53612b105e5819c880ccf235ae8e505
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45 b/metadata/md5-cache/dev-java/bcmail-1.45
index ecb99028443f..936f70ea34df 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45
+++ b/metadata/md5-cache/dev-java/bcmail-1.45
@@ -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=0
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9628879f2e626f458e12e2f61b5d54f6
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r1 b/metadata/md5-cache/dev-java/bcprov-1.38-r1
index 2fd14ef8564c..bb6db00c814e 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.38-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=1.3
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk14-138.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e5a163901b9209e5682f37f65ac8093a
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r2 b/metadata/md5-cache/dev-java/bcprov-1.38-r2
index 8ffc07b54cdc..2e21ce6a9fca 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4173a5f512df868b0fbda41a0af1ab01
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40 b/metadata/md5-cache/dev-java/bcprov-1.40
index 4d5511c8528b..416320ffb599 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.40
+++ b/metadata/md5-cache/dev-java/bcprov-1.40
@@ -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.3
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15-140.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d93cf13607a704d14333da0155b5952
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45 b/metadata/md5-cache/dev-java/bcprov-1.45
index e90eb2eb7612..20385baeafb0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e27bc809c7ce9b30e20f51d1f75da702
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45 b/metadata/md5-cache/dev-java/bctsp-1.45
index de425d8e1db3..40a21a68043a 100644
--- a/metadata/md5-cache/dev-java/bctsp-1.45
+++ b/metadata/md5-cache/dev-java/bctsp-1.45
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c9eb67d8a687a1b190976458e0bafb4
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1 b/metadata/md5-cache/dev-java/beansbinding-1.2.1
index 0d08137f0f1e..08a0d572de71 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d335965a78c4e552fc3087ab5eb29f5
diff --git a/metadata/md5-cache/dev-java/biojava-1.6 b/metadata/md5-cache/dev-java/biojava-1.6
index c2a70c37dd1d..c04a65799a19 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dbc5fedabaa5a3484757efbcd29ab299
diff --git a/metadata/md5-cache/dev-java/biojava-1.7 b/metadata/md5-cache/dev-java/biojava-1.7
index 6c64aa94fae0..d706f3f26ac5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 c1f0df0bacf0..5d7724809fdd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46057b6734f1ef2fe0198caa2b5a9624
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3
index fecdcdb75bc7..e73cb46ae20d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66757fa96ffaa56fcfa05837c4d481a6
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 954fba4b9e58..831652783afd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0cd91ca646c2e9b74bfd7a70078da530
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r3 b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r3
index 2c44d94b7f2a..8342aec32184 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r3
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 dev-java/servletapi:2.4 readline? ( dev-java/libreadli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.beanshell.org/bsh-2.0b4-src.jar mirror://gentoo/beanshell-icon.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de2926b88d0b6abf82ceaee3d50ab2c8
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 48ff86a8c591..9ad70a5abde3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ad2a26edfc9d8d9fd17feb63136f3090
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 8f4c5ae1399a..491ed2e34f98 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cff55af1b7b2d13b47ef704fb37de0fd
diff --git a/metadata/md5-cache/dev-java/bytecode-20081007 b/metadata/md5-cache/dev-java/bytecode-20081007
index f3e23cc69344..3d7c39b02a37 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7663ce522d2933772407ca6e6ebd4081
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.6 b/metadata/md5-cache/dev-java/bytelist-1.0.6
index 1aa3407f8cb7..8847716a9b5a 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.6
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.6
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/jcodings >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/bytelist-1.0.6.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c27710788bba2d80553c17d0f3b6159e
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.9 b/metadata/md5-cache/dev-java/bytelist-1.0.9
index 1473ff901a49..337ec229a2c2 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.9
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.9
@@ -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.9 -> bytelist-1.0.9.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=899d32be72a31b0a4559315fe15b497a
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 965db0dfa7e6..efd87af8ff05 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 b9f1a93c2c1a..fe6f55830d6f 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*
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=063131dead97415a234634fe8e39a72e
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 e624f827d0e1..7b10ceaea548 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11759bb61ca0b6a658d2cfba730ddb66
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 1157e58837d2..cf59476ce59c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cddb6f5ad428d1e4b5f7367fc6833781
diff --git a/metadata/md5-cache/dev-java/caucho-services-3.0.8-r1 b/metadata/md5-cache/dev-java/caucho-services-3.0.8-r1
index c22f332b4120..7264a4fdc777 100644
--- a/metadata/md5-cache/dev-java/caucho-services-3.0.8-r1
+++ b/metadata/md5-cache/dev-java/caucho-services-3.0.8-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 ~dev-java/servletapi-2.3 >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://gentoo/caucho-services-3.0.8.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d3ee01d964acb28e2cef11feaa37512
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 91e473f5dfb9..bb5effaa0240 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e0255cb4627767db49d454372314a72
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 5e0d936fc158..d11f16176da1 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=cdegroot
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7fd80c5cb49b62a3e33d84ad16a309c1
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 3e23eb40e3b4..8c496b02d139 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4646704487f22f4df45454359b24fc35
diff --git a/metadata/md5-cache/dev-java/cglib-2.1.3 b/metadata/md5-cache/dev-java/cglib-2.1.3
index 336172c6c349..252163504190 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aea358d2b7a3fbd81ca52fbd0d9ca777
diff --git a/metadata/md5-cache/dev-java/cglib-2.2 b/metadata/md5-cache/dev-java/cglib-2.2
index 3aafc8c09ea0..46785e43db86 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc2b9618f3c28115d60e8131264410a0
diff --git a/metadata/md5-cache/dev-java/charva-1.0.1-r1 b/metadata/md5-cache/dev-java/charva-1.0.1-r1
index 3c37549aca19..2b821765f6c9 100644
--- a/metadata/md5-cache/dev-java/charva-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/charva-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3 sys-libs/ncurses >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.pitman.co.za/projects/charva/download/charva-1.0.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7b9108edfd26aed562715d9cf9d0e0a6
diff --git a/metadata/md5-cache/dev-java/charva-1.1.4 b/metadata/md5-cache/dev-java/charva-1.1.4
index a957fb0a86f7..f550f3451a16 100644
--- a/metadata/md5-cache/dev-java/charva-1.1.4
+++ b/metadata/md5-cache/dev-java/charva-1.1.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 sys-libs/ncurses dev-java/commons-logging:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/charva/charva/charva-1.1.4/charva.zip -> charva-1.1.4.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46181a05f88dfe88b6517ce4bf76242a
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 65943b4fb607..49baad092764 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=664d1641807bea309581a96ae620e3c4
diff --git a/metadata/md5-cache/dev-java/classworlds-1.0-r3 b/metadata/md5-cache/dev-java/classworlds-1.0-r3
index c63e9f2cfc8e..abb939e89f1d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a43fd996992e..11204b02fc66 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=213b93357b483c903497edcd4c3e653e
diff --git a/metadata/md5-cache/dev-java/cocoon-2.1.11 b/metadata/md5-cache/dev-java/cocoon-2.1.11
index 60b946d59479..ed4b296e6295 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6aee3c706cf9b84b3c80797cb0a001b5
diff --git a/metadata/md5-cache/dev-java/codemodel-2.1 b/metadata/md5-cache/dev-java/codemodel-2.1
index dc73b4fc3f4f..29899a01011e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=399e7336e8ed53aa62c7d3145eaa2d95
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 3a9cff3ee95d..1534a15f937e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8937ad606d8d642e1e27740cf03c5ae
diff --git a/metadata/md5-cache/dev-java/commons-attributes-2.2 b/metadata/md5-cache/dev-java/commons-attributes-2.2
index 95cc7017d8d8..22058ee08297 100644
--- a/metadata/md5-cache/dev-java/commons-attributes-2.2
+++ b/metadata/md5-cache/dev-java/commons-attributes-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xjavadoc dev-java/gjdoc dev-java/ant-core dev-java/qdox:1.6 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/attributes/source/commons-attributes-2.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49d11fbe24294da53388232c7b7180ce
diff --git a/metadata/md5-cache/dev-java/commons-attributes-2.2-r1 b/metadata/md5-cache/dev-java/commons-attributes-2.2-r1
index bc59343f40da..ccdd13d32ef2 100644
--- a/metadata/md5-cache/dev-java/commons-attributes-2.2-r1
+++ b/metadata/md5-cache/dev-java/commons-attributes-2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xjavadoc dev-java/gjdoc dev-java/ant-core dev-java/qdox:1.6 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/attributes/source/commons-attributes-2.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=971de58584fe59d80925ddf27edffa7b
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.6.1-r3 b/metadata/md5-cache/dev-java/commons-beanutils-1.6.1-r3
index d81d79153209..7a4fa07c206c 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.6.1-r3
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.6.1-r3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/commons-collections-2.1 >=dev-java/commons-
 RESTRICT=test
 SLOT=1.6
 SRC_URI=mirror://apache/jakarta/commons/beanutils/source/commons-beanutils-1.6.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0863d0fb090bc4845fa8e8ae3ad5cb8d
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 39a58900eb66..402f499eea09 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5e690e12bc56..47f85b5f6a2a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5b78b7aa61f2..9dd75799d4af 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=137e7efe556f5bbeaa1eee273ea0b34d
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.2 b/metadata/md5-cache/dev-java/commons-cli-1.2
index 1fb8b4f2c817..d04afa5519c1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=957b186b2418cf61dfe7ffed95d10e96
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.4 b/metadata/md5-cache/dev-java/commons-codec-1.4
index 9d1ee05b0c8b..2d47b0940339 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.4
+++ b/metadata/md5-cache/dev-java/commons-codec-1.4
@@ -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://apache/commons/codec/source/commons-codec-1.4-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9832b6562016196dd5c11a2a8fba0db4
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 7dfa2ee69a3e..efe432b5d8f1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f4967e4272fb4dc91e63a0880f8c387
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.1 b/metadata/md5-cache/dev-java/commons-compress-1.1
index cf8d4f91ddf5..349a58629bc0 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.1
+++ b/metadata/md5-cache/dev-java/commons-compress-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=mirror://apache/commons//compress/source/commons-compress-1.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83466032db3dce0ff2d8374c42721a99
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.3 b/metadata/md5-cache/dev-java/commons-compress-1.3
index 49cc8ef6334b..336f12d82299 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.3
+++ b/metadata/md5-cache/dev-java/commons-compress-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=mirror://apache/commons//compress/source/commons-compress-1.3-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a4bcba701e38dd0e7ef3fcf5286d804
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 8f65dd39d89f..8f194ffdde8e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72f74d7e424ba270469d94db8d4421bd
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6 b/metadata/md5-cache/dev-java/commons-configuration-1.6
index e70d071bced8..bcb16317aa8c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f708092f939f8c70a2e2b6fa5fda580
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.2 b/metadata/md5-cache/dev-java/commons-daemon-1.0.2
index 8cc2501754a1..c190aa782bba 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.2
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.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=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.2-src.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=713eb56b466b0f3e8670bb8ebfa92e08
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.4 b/metadata/md5-cache/dev-java/commons-daemon-1.0.4
index 80ee66142715..c6076e9980b6 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.4
@@ -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://apache/commons/daemon/source/commons-daemon-1.0.4-src.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29f3f5034e32354dfae472a9bd94782d
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 3dc946070ddf..6332deec6347 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d60d5bd59a43f1c118b64bdd994ad925
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.8 b/metadata/md5-cache/dev-java/commons-daemon-1.0.8
index 189d2c3598f6..bd01a158356d 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.8
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.8
@@ -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.8-src.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6ab02baf8f8a0fc4ce41254eacc176b
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 1667f44b2614..44ad527052bc 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
 EAPI=4
 HOMEPAGE=http://commons.apache.org/daemon/
 IUSE=kernel_linux elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2eacb22899a7f9165f9815bc676203c8
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=72b86c6be1fc612bee5501a1d550679e
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-1.2.2-r1 b/metadata/md5-cache/dev-java/commons-dbcp-1.2.2-r1
index 163fb1c449dd..86bdefb9897a 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/commons-pool-1.3 >=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://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0872f5e839ec240eaeddf0d9760ff7b
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r1 b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r1
index cfe037dd552e..a1a0ded07d15 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-pool-1.3 dev-java/glassfish-transaction-api:0 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=919541de4cca98d2be709e415003ca2c
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 5aa20a6f57d6..c0f8cab69652 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=88ebb16bbb3f340e63dccb069b746154
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.1 b/metadata/md5-cache/dev-java/commons-dbutils-1.1
index 734f710791e8..3c18d8e58967 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a02049a0513139e74a3977f0c2d2a4b9
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1 b/metadata/md5-cache/dev-java/commons-digester-1.8.1
index aed9de79a48c..f5754153a667 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-beanutils:1.6 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2: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/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c4a0559425e1ea61400974d3f1c76f6
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 721d4a995a87..0b04c698ad17 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c78c57c7ef3f0122730fcb2b9fa5feaa
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.4 b/metadata/md5-cache/dev-java/commons-discovery-0.4
index 8bb3fec34dd5..5ea209064203 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4869dce88eaff16a8058b171d747cc0
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r1 b/metadata/md5-cache/dev-java/commons-el-1.0-r1
index bc8437404d4a..a7df7c2f5474 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r1
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 ~dev-java/servletapi-2.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b10fabe62e699db2a7b3bad65820bb7
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r2 b/metadata/md5-cache/dev-java/commons-el-1.0-r2
index a32d51f63b15..94b4c398257a 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r2
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 ~dev-java/servletapi-2.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f6cda60b69ba2c07a2e660e928ab93a
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1 b/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1
index 4d08a14f2913..26df8740d151 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/fileupload/source/commons-fileupload-1.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=56ffb342fba15326aaf21846ed657762
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1 b/metadata/md5-cache/dev-java/commons-fileupload-1.2.1
index 244083a4e422..24ec0a10a3a2 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a990353b4b510c0b51d350a46bc85b58
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 9d9b84c84808..b9c66fe19a79 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
@@ -4,10 +4,10 @@ DESCRIPTION=Add robust, high-performance, file upload capability to your servlet
 EAPI=4
 HOMEPAGE=http://commons.apache.org/fileupload/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e5d3ddb6ffdb9a1567fce2d0ab7c6408
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=71c93ae922fd667474e1b8330b4edd02
diff --git a/metadata/md5-cache/dev-java/commons-grant-1.0_beta5-r1 b/metadata/md5-cache/dev-java/commons-grant-1.0_beta5-r1
index 54fd15ff6f49..0e30da33862e 100644
--- a/metadata/md5-cache/dev-java/commons-grant-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/commons-grant-1.0_beta5-r1
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=00d3d91f329c8a629e741e9bbc6a6936
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 111a4ff592e9..6d12c46421e9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9097e44033b7..70f3ae54caba 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 1b51776f0f96..ae87f491570a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 564214f7f215..1e2de93b14e1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=089d3c4c3256c39a372812c98378d450
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 f8190bdf13ff..4e4fb45846f6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac2e3849aef12c800aba826779c4ce59
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 b1d1242dae47..3990b60498b9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=219378d517c5c2aeb0e661cc693dee06
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1 b/metadata/md5-cache/dev-java/commons-jexl-1.1
index 3b2b28e77597..6eb249bdb49f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57d8ec480abdc32ca8d81aa600e7ddea
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3 b/metadata/md5-cache/dev-java/commons-jxpath-1.3
index 0ac24c955ca7..427781415cc3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=debde346520f58a2c2c4758fc24f8d04
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 afc24f7b1401..a13b9069702a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fa2edba9a9b1ccc67f491060558eb8da
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.4 b/metadata/md5-cache/dev-java/commons-lang-2.4
index faf1497b2849..237a4d587a01 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.4
+++ b/metadata/md5-cache/dev-java/commons-lang-2.4
@@ -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.4-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=528683e3256a7f1a95ea6479861168c5
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6 b/metadata/md5-cache/dev-java/commons-lang-2.6
index d0b63fd2d392..b96a8cebf6eb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7716fd9904e76d2a4096481a01e972f
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 9d4745bfbffe..6398bff3ebe6 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0fb9aaaf8f955e95b16bb6c9e6555af7
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 a9e8a88bea8f..87b1112270b8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cfa2a85db6495a6320e978d0bb2e33bc
diff --git a/metadata/md5-cache/dev-java/commons-math-2.0 b/metadata/md5-cache/dev-java/commons-math-2.0
index 4a5ce3a74ced..c3909376cba5 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.0
+++ b/metadata/md5-cache/dev-java/commons-math-2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/commons-discovery-0.2:0 >=dev-java/commons-logging-1.0.3:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.0-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b602b9d050cccc85c36193b7c06d5a54
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 0bd41699c759..d81402ff40be 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0147c3dc4020ef90d621a000fa5ec57
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 019f1f03ce23..b441e8072109 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 e555df1e504c..4ceb19be2f69 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b05dff6e4ce137ed5589bd4d6118605d
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.5.4 b/metadata/md5-cache/dev-java/commons-pool-1.5.4
index e46057615552..fd0b640624dc 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.5.4
+++ b/metadata/md5-cache/dev-java/commons-pool-1.5.4
@@ -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://apache/commons/pool/source/commons-pool-1.5.4-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=376afee5bb2d957b66aeb3407a9356b3
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.5.5 b/metadata/md5-cache/dev-java/commons-pool-1.5.5
index 91d95196fe64..8e481f6e0639 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.5.5
+++ b/metadata/md5-cache/dev-java/commons-pool-1.5.5
@@ -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://apache/commons/pool/source/commons-pool-1.5.5-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff13f4f024042d6c52067c921fcdec31
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.5.6 b/metadata/md5-cache/dev-java/commons-pool-1.5.6
index aad4fd3b49b0..7663da058057 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.5.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.5.6
@@ -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://apache/commons/pool/source/commons-pool-1.5.6-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6f90ef90f98388d9e4193ca10065bfc
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 a017e0ddd20e..2485d9088f1b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=adc76032f91474b9eaf0d805f64bb7d8
diff --git a/metadata/md5-cache/dev-java/commons-transaction-1.0.1-r2 b/metadata/md5-cache/dev-java/commons-transaction-1.0.1-r2
index 9865dedd2132..18e5e6ce22b5 100644
--- a/metadata/md5-cache/dev-java/commons-transaction-1.0.1-r2
+++ b/metadata/md5-cache/dev-java/commons-transaction-1.0.1-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-codec java-virtuals/transaction-api dev-java/log4j >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/transaction/source/commons-transaction-1.0.1-src.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dce3545ea82955fb714c606cf217543a
diff --git a/metadata/md5-cache/dev-java/commons-transaction-1.2 b/metadata/md5-cache/dev-java/commons-transaction-1.2
index 8ab20aa3a7ea..9c2737227117 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24b777a3923fa1b7579242f4751a50e1
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.3.1 b/metadata/md5-cache/dev-java/commons-validator-1.3.1
index c92e03a3211a..0442ccf37bd1 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.3.1
+++ b/metadata/md5-cache/dev-java/commons-validator-1.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/jakarta-oro:2.0 >=dev-java/commons-digester-1.6 >=dev-java/commons-collections-3.1 >=dev-java/commons-logging-1.0.4 dev-java/commons-beanutils:1.7 >=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/validator/source/commons-validator-1.3.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=720c664b3876eff8622b39c94f8a6944
diff --git a/metadata/md5-cache/dev-java/commons-vfs-1.0 b/metadata/md5-cache/dev-java/commons-vfs-1.0
index 4f4bc03ed03a..20c1da655ea8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f55f07768852c00d9e99ed460bff67e
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 1019161f2607..6de6b06e05e1 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e73b15603efd1dc8e3d31d7e42fef75
diff --git a/metadata/md5-cache/dev-java/constantine-0.5 b/metadata/md5-cache/dev-java/constantine-0.5
index 5a8ccda3dbad..01a38ae5840d 100644
--- a/metadata/md5-cache/dev-java/constantine-0.5
+++ b/metadata/md5-cache/dev-java/constantine-0.5
@@ -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.5.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3037a85b0fb945fc7c235a83204e046f
diff --git a/metadata/md5-cache/dev-java/constantine-0.6 b/metadata/md5-cache/dev-java/constantine-0.6
index a355432a62ad..a440ec53f528 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ced2efa01d605ec6ef8ef29169ecb4fc
diff --git a/metadata/md5-cache/dev-java/constantine-0.7 b/metadata/md5-cache/dev-java/constantine-0.7
index d0dc15f00f71..dcd81e760f15 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 10085de7369e..fda99dd173c8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a63289989e6f14efa7bd0043842e129
diff --git a/metadata/md5-cache/dev-java/cos-20021105-r2 b/metadata/md5-cache/dev-java/cos-20021105-r2
index 4082c19d2931..0c5d765e5e21 100644
--- a/metadata/md5-cache/dev-java/cos-20021105-r2
+++ b/metadata/md5-cache/dev-java/cos-20021105-r2
@@ -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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://servlets.com/cos/cos-05Nov2002.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d38cf5b55b8b1e0a47a059584bc316db
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 1352ba60d1f9..11b16f1aa09d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ebeeb2f88c997dc6eff5096de96db4a
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index 7cbc2ca7d81d..9dc1c9320463 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5169c29685ca85aca980addb6121eb88
diff --git a/metadata/md5-cache/dev-java/css-validator-20120222 b/metadata/md5-cache/dev-java/css-validator-20120222
index 0c4d0b6b3189..390ffba6c2c4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a6256c54a7ed3c3858dc2ad7531b78f
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index f44dad95677d..770ea8fc7ee4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9a41db51dfcf..43dc498b41da 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 b3b26214f220..8883af55cccb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5bc702203814137badcfb310cb9b8eb6
diff --git a/metadata/md5-cache/dev-java/dbunit-2.2 b/metadata/md5-cache/dev-java/dbunit-2.2
index af0e8d510077..c1a4cf4e368e 100644
--- a/metadata/md5-cache/dev-java/dbunit-2.2
+++ b/metadata/md5-cache/dev-java/dbunit-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/poi-2.0:0 >=dev-java/junit-3.8:0 >=dev-java/ant-core-1.6:0 dev-java/commons-logging:0 >=dev-java/commons-lang-2.1:2.1 dev-java/commons-collections: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://sourceforge/dbunit/dbunit-2.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea129be66feab1077e11e9011463e041
diff --git a/metadata/md5-cache/dev-java/dbunit-2.4.1 b/metadata/md5-cache/dev-java/dbunit-2.4.1
index f05a7bde34b4..7d0f16535bf0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb11b33190eb82cf4eb823e3329ccce3
diff --git a/metadata/md5-cache/dev-java/dbus-java-2.5.1 b/metadata/md5-cache/dev-java/dbus-java-2.5.1
index 6b78d002190f..3945a64775b3 100644
--- a/metadata/md5-cache/dev-java/dbus-java-2.5.1
+++ b/metadata/md5-cache/dev-java/dbus-java-2.5.1
@@ -8,5 +8,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.5.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4faf1f5de61f61d0d85a78eca196acf
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 ad04b4ea624c..3521faec730e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=819b853b2aca9497c23eebf25902c4e2
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r2 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r2
index f1c690ea210e..54e272a0d12c 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r2
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r2
@@ -8,5 +8,5 @@ LICENSE=dom4j
 RDEPEND=>=virtual/jre-1.3 dev-java/jaxme dev-java/jsr173 dev-java/msv dev-java/xpp2 dev-java/xpp3 dev-java/relaxng-datatype >=dev-java/xerces-2.7 dev-java/xsdlib >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe83eca09640d4f6f3598c8194d652c1
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 0f30bdbe0e47..6e664695c7fd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc92115274b8ca4d5c0eb98a42664364
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.10 b/metadata/md5-cache/dev-java/dsiutils-1.0.10
index 3a375b17f49c..b0825ea7ba23 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.10
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 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 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab2875cf8c65712a6de9339cf046585f
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r1 b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r1
index c32f4f77cc52..c4ebda1012cf 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r1
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 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 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c29bb2bb59b3784930baa3d2d66a5915
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.4 b/metadata/md5-cache/dev-java/dsiutils-1.0.4
index dc75227f68d1..293b88d27a9d 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.4
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-io:1 =dev-java/jsap-2* dev-java/log4j
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dsiutils.dsi.unimi.it/dsiutils-1.0.4-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e94b8fe0b1076d214a00dc746f6d99b
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.5 b/metadata/md5-cache/dev-java/dsiutils-1.0.5
index 8c653e9a66ab..49d730c709c5 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.5
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-io:1 =dev-java/jsap-2* dev-java/log4j
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dsiutils.dsi.unimi.it/dsiutils-1.0.5-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f28436b26039e4cc238a8dbb9666e92
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.7 b/metadata/md5-cache/dev-java/dsiutils-1.0.7
index e9a72bb31477..e5245cf8e466 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.7
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-io:1 =dev-java/jsap-2* dev-java/log4j
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dsiutils.dsi.unimi.it/dsiutils-1.0.7-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f6661627d000c5630426f4324efa2ea
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r1 b/metadata/md5-cache/dev-java/dtdparser-1.21-r1
index 2c913979841c..57c6e1f3a6e0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d98216a69372b8fa7d267a4124fd34c
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4 b/metadata/md5-cache/dev-java/dynalang-0.4
index fca7b9760c49..48741b4d7b08 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d0b73bbb379488c09dec05999cf64290
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.2 b/metadata/md5-cache/dev-java/easyneurons-2.2
index e7ad7417dc13..297229e178d7 100644
--- a/metadata/md5-cache/dev-java/easyneurons-2.2
+++ b/metadata/md5-cache/dev-java/easyneurons-2.2
@@ -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.2 dev-java/javahelp:0 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75e0868787eec43f12c07abc7d8a74bf
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index ba3a75d7744b..8663d6b1d88e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a557acce71a7..9b9ae1dfe146 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d649133047c8292dfee5654e73ab2c4e
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r2 b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r2
index 7fd992ccf5c1..8f329c58a597 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc[gcj] >=app-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55066f57ddb2eae3a6daf2809ed3a891
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.6 b/metadata/md5-cache/dev-java/ecj-gcj-3.6
index e1e170b2b7c2..ea5453e0ffdb 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.6
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.6
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc[gcj] >=app-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3834d853bcb265fc7d309c6b8abb9173
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 af0d902680c5..ac22620aaf10 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-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4253e3a2c60d7fa30b1122b5c96f6b7d
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 46104f5fa7a6..bfaeb0effda2 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-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5bf4d4bc15b733f50abd32bb1d885783
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 f4b75196e1a9..9fc9e1ed727d 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-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e576aa4e5d4819baf10bf5aebdb2218
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.6 b/metadata/md5-cache/dev-java/eclipse-ecj-3.6
index df5eacbdf15f..18e5ae733752 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.6
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.6
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.6 )
 RDEPEND=>=app-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9560c5884a4d81235236b9d60825a4c3
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 22291a406fe5..2144fcfd60eb 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-admin/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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c2e594136d2cae5e89f2b9d69079960
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2 b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2
index 30d8c9da9f10..e302f59d8b46 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.7.2 )
 RDEPEND=>=app-admin/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.2-201202080800/ecjsrc-3.7.2.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=816156376426b2910e6d4cdd6672dd3c
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 5883fd404f4f..c48dae4ec791 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4b3caa0a51d920857d2e4a55bd961419
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.0.3 b/metadata/md5-cache/dev-java/edtftpj-2.0.3
index 6bba76cb7e83..d297db589270 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.0.3
+++ b/metadata/md5-cache/dev-java/edtftpj-2.0.3
@@ -8,5 +8,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.3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=138177b039ba0ea041cc71e2cbb94584
diff --git a/metadata/md5-cache/dev-java/ehcache-1.1-r1 b/metadata/md5-cache/dev-java/ehcache-1.1-r1
index beab58ca3732..d5218a0f3fde 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c7784b28970f76e4d48958317bf76f0
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4 b/metadata/md5-cache/dev-java/ehcache-1.2.4
index 26da96aad061..0759b904b5d8 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4
@@ -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/servletapi-2.4 >=dev-java/java-config-2.1.9-r1
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b79bce769cce96610cefbfe2ba6489c
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 4ebe6f1224ad..ad28625d57f7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d15d4eb9cde16abc5d692786435e2c2
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 44919c60b6c1..779ad8cb686f 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9e29acb541645195882acbb50ff618a
diff --git a/metadata/md5-cache/dev-java/excalibur-logger-2.1-r1 b/metadata/md5-cache/dev-java/excalibur-logger-2.1-r1
index e5e60638b794..55303b33c600 100644
--- a/metadata/md5-cache/dev-java/excalibur-logger-2.1-r1
+++ b/metadata/md5-cache/dev-java/excalibur-logger-2.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2.1* =dev-java/avalon-framework-4.2* dev-java/log4j =dev-java/servletapi-2.4* java-virtuals/javamail dev-java/sun-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e449f461d92b5c2fc40f992d1b88212b
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 157cdca8906d..707ec1dcce27 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7f34484ddcd3a247ba926189d18ff4e
diff --git a/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r1 b/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r1
index ff7bfb1adf4b..bf7507e3181f 100644
--- a/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r1
+++ b/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r1
@@ -8,5 +8,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.4 dev-java/cdegroot-db dev-java/commons-logging =dev-java/jakarta-oro-2.0* >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/exolabcore-20050205.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b0fe5e567bb41f854af849ea5948c062
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 116985e52eb2..518e4102e50f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 513a94587f6b..a508284b4801 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=655cd4120c97a033298e9614202d59b9
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.1 b/metadata/md5-cache/dev-java/fastinfoset-1.2.1
index 095cd9fd4bf7..da63103b3107 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.1
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2cc6e8d9a6bf32fdde56afa422d9f242
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 6e641ad8d482..ddea1f3fa976 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f06a1c5e64f8eaa60cc2a25584ce8695
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 c06643311df9..f1512c6db490 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c53c8bea3b3af8f3f950c9524ab4cbf6
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 78080856b1c7..6e80693a395b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85ae4c9ee720e0999e3e72b312d59a3f
diff --git a/metadata/md5-cache/dev-java/fastutil-5.0.9 b/metadata/md5-cache/dev-java/fastutil-5.0.9
index 386b2c7fd466..74665599552d 100644
--- a/metadata/md5-cache/dev-java/fastutil-5.0.9
+++ b/metadata/md5-cache/dev-java/fastutil-5.0.9
@@ -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.0.9-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb91b3bb797b4e4cbff9f94e1cbca18b
diff --git a/metadata/md5-cache/dev-java/fastutil-5.1.3 b/metadata/md5-cache/dev-java/fastutil-5.1.3
index 62f8ed9bdb25..ef68baae40b9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef8b7c4b1c2e5fed46de58a0167ad964
diff --git a/metadata/md5-cache/dev-java/fec-1.0.3-r1 b/metadata/md5-cache/dev-java/fec-1.0.3-r1
index c3b2e3923775..dda390932b03 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/fec-1.0.3-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.4 dev-java/log4j dev-java/concurrent-util !net-libs/fec >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.onionnetworks.com/downloads/fec-1.0.3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05fe99a257bbf2fbc184bd4a6b4fccd6
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 a1301f6d7ada..cfa9212d8375 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4706d3dd814b5d8b4b15c199adadf1fa
diff --git a/metadata/md5-cache/dev-java/flute-1.3-r1 b/metadata/md5-cache/dev-java/flute-1.3-r1
index 1ce9f90e984f..71afa67952fc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5caf5e8cd6858e616999ab8da3dc96d5
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7 b/metadata/md5-cache/dev-java/flyingsaucer-7
index cc6530a6acc2..edcc85e9e0f9 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7
@@ -10,5 +10,5 @@ RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) dev-java/itext:0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22e2d5ac9ed727fa520a077831145197
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r1 b/metadata/md5-cache/dev-java/flyingsaucer-7-r1
index b608d28dd2f0..73c942289280 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r1
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r1
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca44f92d0ebb5b4421b7f02f85438a49
diff --git a/metadata/md5-cache/dev-java/fontbox-0.1.0 b/metadata/md5-cache/dev-java/fontbox-0.1.0
index 6304a2453991..5f7b36841c00 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b9a05703a3991ca47423df0b4a2133ed
diff --git a/metadata/md5-cache/dev-java/fop-0.95 b/metadata/md5-cache/dev-java/fop-0.95
index dd2af3e813ce..d7507a7ae2a6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=34fd8d7066d614a7f0d4132bdbb651e7
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 936fc6665101..a8ce311080d6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=082c684dfc0b4b1608d499b5372d7088
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 7f74df5b920d..6aee5e593dce 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 31259417190e..2b49bf4610d7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5d0c7eb257c6..bca36f851fbb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 7e09bbf79766..d97202f10e03 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9a851fbfa927..1bc0659517b7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 94f7ceb77f1c..3ee37c2bb59a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 8be3ddf0991b..0395806d4cc5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 97dd994b91d1..f087e15596c1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 87d5ba533d93..e8bcdd4229f1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f986ee8f4f2d..c0ae2f02f5a1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9b30883a6217..36ee56097650 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 955f1199fb02..3aab16dc2192 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4440821436c1..78cec2643c94 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ad623695a09b..4aea510ca165 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 11133880827e..29c599f82f30 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 52fe74e94fbe..9510f1229e0a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9742f97ece66d396f8ec17ae6f242fcc
diff --git a/metadata/md5-cache/dev-java/freehep-rtti-2.0 b/metadata/md5-cache/dev-java/freehep-rtti-2.0
index 29a8dc68a59f..8d65dc957221 100644
--- a/metadata/md5-cache/dev-java/freehep-rtti-2.0
+++ b/metadata/md5-cache/dev-java/freehep-rtti-2.0
@@ -8,5 +8,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/freehep-rtti-2.0-sources.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7516ee55632e2327306cea9ae3a7dadc
diff --git a/metadata/md5-cache/dev-java/freehep-sio-2.0 b/metadata/md5-cache/dev-java/freehep-sio-2.0
index 38a877bfe071..4c102089d847 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 7c324a476862..2684718b1156 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 6520f6f95639..613c1100fd1b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 24a3133ebab5..027a99ccc19f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 aac9b3b645a8..7db6fb77b74f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 97c62e4d0362..1e1c1d2ef14e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 328105a99803..ab3e11368457 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a149f7ace6f24a92bd313af218e739b
diff --git a/metadata/md5-cache/dev-java/fscript-1.17 b/metadata/md5-cache/dev-java/fscript-1.17
index 8d1ba493ff38..5ae45b41dd65 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=acdd3282023f0ad8667b28e0aa306331
diff --git a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1 b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
index 10fb049bf9c7..e961e28e2e84 100644
--- a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
+++ b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r1
@@ -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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b082306f961038448c4b3652d02353b
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 e523fa62b61a..9dc19b24bcb3 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5f27b93aed9b93e5609dd91eb3135aa
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 33fe8c31433a..6d6e248d4b6b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 09e2e5752d52..1c15f6f5f026 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=61260ab1cef9b5f211ea83f20a385211
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 3260e5ddba57..0d9af7a315b0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0db22d7cd5c5febd173e06e91bdbc25f
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0
index 8393b852e6fc..007961cd0b48 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-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=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c78a2c04f376569daeda835961445456
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 67b073283a86..83c6a165dac8 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 6e1cc5bd8583..affe1e1a1cea 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1c6378f71ccc39f9e43515095b8e07e
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 e72800a20686..09decfbdd1b6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5d1db685b32a8948bb2824ef9f62fcfa
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 c2a63c60e8d1..3b65848a9f7c 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 >=media-libs/gst-plugins-base-0.10.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? ( x11-libs/qt-gui: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_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58dcb4c665fda2cb7fdafd043342cb6a
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 e7b1fd10cb37..b650e984ce55 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9111d7f09bef..77572be1f833 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 66a71946259c..8143c988e3ee 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
@@ -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=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1224eb15b87de7a6da6e3f65699e771
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 01e3c0d68328..a86f7d2fdece 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 d1a43e09fce7..17a0479ec9a0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 654317ecc5f4..2a628237aae4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a183cfd2dc3b60664f6da671baa4afa5
diff --git a/metadata/md5-cache/dev-java/groovy-1.6.8 b/metadata/md5-cache/dev-java/groovy-1.6.8
index 6175ebd5292e..c3ca7f71a212 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=123a8b8746323c7ffc40e0f26f8b0588
diff --git a/metadata/md5-cache/dev-java/groovy-1.7.10 b/metadata/md5-cache/dev-java/groovy-1.7.10
index 078b1d0d035c..1109f6f41991 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0623aba43028b00fe411d3b551f302e3
diff --git a/metadata/md5-cache/dev-java/groovy-1.7.5 b/metadata/md5-cache/dev-java/groovy-1.7.5
index 21db82052127..44fbf26df28b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aea63207136c936d78df57ee59de2ab3
diff --git a/metadata/md5-cache/dev-java/groovy-1.8.5 b/metadata/md5-cache/dev-java/groovy-1.8.5
index 8c0a36fc82f3..c882eec5a2a6 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=918ea49bc50707cbbacfadd6e3998bcb
diff --git a/metadata/md5-cache/dev-java/guava-07 b/metadata/md5-cache/dev-java/guava-07
index a3768d32a11e..67d6c6b18fe9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33e58072b944a60e406fd63e376e9442
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1
index 5ae2075b4083..6b1de9c4584e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6cb48bf2ba641e24495b30a92d4f9ad6
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r1 b/metadata/md5-cache/dev-java/helpgui-1.1-r1
index c58079057986..44f15589c768 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0265ae334bd44524b1dd41f277143f77
diff --git a/metadata/md5-cache/dev-java/hessian-3.0.20 b/metadata/md5-cache/dev-java/hessian-3.0.20
index eec4fcc94ad3..c646f97f125f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b9959998c962b52cf401da626ca11943
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 4861180f4ca7..e51e055cd946 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98d8ebab281d74ca075e2d1d40098b8f
diff --git a/metadata/md5-cache/dev-java/hessian-3.1.6 b/metadata/md5-cache/dev-java/hessian-3.1.6
index 9bef5f938f67..7739b12cfb2e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e36653c645becf963b30f87a5cd7e125
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.3 b/metadata/md5-cache/dev-java/hessian-4.0.3
index e517180cf8cb..46cd1ea0bfc0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20a89aeb5aaa2bb6db1d2b28047cc142
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 d4719a615f2a..bd4d66b9e13b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f197945b020db0c1f24756f82759da1
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r1 b/metadata/md5-cache/dev-java/higlayout-1.0-r1
index d82d4b90178f..71f38936a169 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1c14ac13d720f7e96290b305b0138ee3
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0 b/metadata/md5-cache/dev-java/hoteqn-4.0.0
index 9c48ddb3d7bf..ce3e9deec827 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9bf39fe30c40acba0ef30042cef1d03
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.3.1 b/metadata/md5-cache/dev-java/htmlparser-1.3.1
index 67532cff4212..52ba43c3dc70 100644
--- a/metadata/md5-cache/dev-java/htmlparser-1.3.1
+++ b/metadata/md5-cache/dev-java/htmlparser-1.3.1
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.5 dev-java/icu4j:4 dev-java/xom dev-java/jchardet >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://about.validator.nu/htmlparser/htmlparser-1.3.1.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7cd25a68f977e0cdcb9589b1a307e0ee
diff --git a/metadata/md5-cache/dev-java/httpunit-1.6.2-r3 b/metadata/md5-cache/dev-java/httpunit-1.6.2-r3
index a62d9d32ef34..b6b58b3ba7bd 100644
--- a/metadata/md5-cache/dev-java/httpunit-1.6.2-r3
+++ b/metadata/md5-cache/dev-java/httpunit-1.6.2-r3
@@ -9,5 +9,5 @@ LICENSE=as-is
 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.6.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fde8095cedae5d91c0e34da2ffd6defa
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0_beta2 b/metadata/md5-cache/dev-java/ical4j-1.0_beta2
index 678dc1405b80..1caa16ad3a13 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=204ac437c1dbbc1e622278eab7d740d1
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.10.6 b/metadata/md5-cache/dev-java/icedtea-6.1.10.6
index 73ba89cd90a4..458e2e64cc52 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.10.6
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.10.6
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[
 RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) 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 >=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 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 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.10.6.tar.gz http://download.java.net/openjdk/jdk6/promoted/b22/openjdk-6-src-b22-28_feb_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_01.zip hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/f0f676c5a2c6.tar.gz ) !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/c7bf150bfa46.tar.gz ) ) )
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=61b8de4edc6029317ab0212580e374b7
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.11.1 b/metadata/md5-cache/dev-java/icedtea-6.1.11.1
index 044942ddd326..fb289710fc9a 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.11.1
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.11.1
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[
 RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) 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 >=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 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 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.11.1.tar.gz http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_03.zip !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz ) ) )
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=d24b267389ae9fbb7051da5b5f446147
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.11.2 b/metadata/md5-cache/dev-java/icedtea-6.1.11.2
index 7740a48d02fb..14e5f4748e70 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.11.2
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.11.2
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[
 RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) 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 >=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 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 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.11.2.tar.gz http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_03.zip !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz ) ) )
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=93bee33a2df527654957974b5c0739da
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.0.1 b/metadata/md5-cache/dev-java/icedtea-7.2.0.1
index 689f3a6c3d54..85601402f7f7 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.0.1
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:7 ) nsplugin? ( dev-java/icedtea-web:7[
 RDEPEND=>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=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 >=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/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 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.0.1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/4b063ca7483f.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/d37539e7e838.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/ae891cd6ba73.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/1107cfa36f53.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/891fb0050add.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/9dfaed4a95e2.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/f0faea84413f.tar.gz !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz ) ) )
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=e2e76ce623b2eb63966cd9f19d8b5724
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.1 b/metadata/md5-cache/dev-java/icedtea-7.2.1
index 4ee6aa91a143..ad64b8452676 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.1
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:7 ) nsplugin? ( dev-java/icedtea-web:7[
 RDEPEND=>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=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 >=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/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 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/archive/22cc03983e20.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba/archive/5617f6c5cc94.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp/archive/1cf75c0e2c96.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxws/archive/7edfbfe974f2.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk/archive/50f6f276a06c.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/0e651e004747.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools/archive/b534c4c6cd9b.tar.gz !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz ) ) )
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=4d16d7d8b4ddf8695e4b7a44ddf92b45
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1 b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1
index 76186779955b..757dc313982f 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1
+++ b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=6
 SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.1-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-6.1.11.1.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.1-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.1-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-6.1.11.1.tar.bz2 )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=20bbe007696921048372d5edd90b566e
+_md5_=dfd612e6368efc46ba7524cb442d4a2f
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1-r1 b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1-r1
index 3880524e1b7d..41167c42198b 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.1-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=6
 SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.1-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-6.1.11.1.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.1-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.1-r1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.1-r1-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-6.1.11.1.tar.bz2 )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=db9f49dcbf7ed4180d41f5029bba42d3
+_md5_=99fc62722ddc65001eae2223f7c25556
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.1 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.1
index ec06e5c33558..46c59d5fe36a 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-7.2.1
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=7
 SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-7.2.1.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-7.2.1.tar.bz2 )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=248d013330940fa949eb1b31ff66e335
+_md5_=295b5529e1939cc7afb38ab8380b5e8d
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.1-r1 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.1-r1
index 5016e6491924..fcef119615d0 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-7.2.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.1-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=7
 SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-7.2.1.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-r1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-r1-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-7.2.1.tar.bz2 )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dd5134d5e639b30197a3ff854d9edc6f
+_md5_=c331d1d9da3192833fd2247f67ff7e93
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.1.4 b/metadata/md5-cache/dev-java/icedtea-web-1.1.4
index f3a8713ffc28..5ff57a7a7917 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.1.4
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:6 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97480a6ca444aea556d45bf66bcae4f6
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r7 b/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r7
index 32421b8595d9..f195f18edda9 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r7
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e930b87be412df5521580efd01566711
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r8 b/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r8
index d40b49a80052..789694d17547 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r8
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.1.4-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69608974a5088925c97900fb322819db
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.2 b/metadata/md5-cache/dev-java/icedtea-web-1.2
index c93057b5ef5b..d1a55fe3e8a5 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:6 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.2.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3692336fa5584a4f81e6b630c0ab3cc8
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.2-r7 b/metadata/md5-cache/dev-java/icedtea-web-1.2-r7
index 8869ca27f8ae..aef276464a95 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.2-r7
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.2-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.2.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-vm-2	a34fe9a7d2a4f163b7f0c5af7d53ae33	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=542e3693ec7470554952cf2124e02d5a
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 d75b8dd32af4..3eaeac2c207a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c25bee94a547df16a0c7f26ae0de9111
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 e1b31b68c12b..01e044e21e5f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c658e7bdc747cf6d5d639ea187414a3
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 42fa823b328d..f1ba03841a94 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a50422f3e3c0e66c3a2190ae6b0dce20
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 579dd2e399ca..864e305c1e0f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1d7b9801538670ac464b788ea45f1b0
diff --git a/metadata/md5-cache/dev-java/icu4j-4.4.2 b/metadata/md5-cache/dev-java/icu4j-4.4.2
index b58e9f49d2cf..aa423859a705 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e74d3562b5b7bbf0f255382af000b7ef
diff --git a/metadata/md5-cache/dev-java/idm-console-framework-1.1.5 b/metadata/md5-cache/dev-java/idm-console-framework-1.1.5
index 65286664a29a..cf154c535303 100644
--- a/metadata/md5-cache/dev-java/idm-console-framework-1.1.5
+++ b/metadata/md5-cache/dev-java/idm-console-framework-1.1.5
@@ -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.5.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53998f9311cafb908360b231cd387a2e
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 4456235897f9..36fbc6d94470 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63653cf65bd0c7b65cd9339739d0c271
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r1 b/metadata/md5-cache/dev-java/iso-relax-20050331-r1
index 89024aa4b5e1..c1db4f3b1b7c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 de2f7ebfd47b..efd9c1cbe524 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5b391a6d5891..a4b856589b67 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5d4c4fcb7289..8ccb8cda300e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 d37658c7b41e..f9d05a87ae81 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 46ad43da6de3..18085a85deb3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 50333f05cf87..d5522a3cb4e2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=23eaa7a8bd2242a9bff33547dcf03f57
diff --git a/metadata/md5-cache/dev-java/itext-2.0.8 b/metadata/md5-cache/dev-java/itext-2.0.8
index d4b13866182c..2d8968f1eebf 100644
--- a/metadata/md5-cache/dev-java/itext-2.0.8
+++ b/metadata/md5-cache/dev-java/itext-2.0.8
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/bcmail-1.38 >=dev-java/bcprov-1.38: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://sourceforge/itext/iText-src-2.0.8.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43b2c0cbc291ed57df5c23bfc748a811
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5 b/metadata/md5-cache/dev-java/itext-2.1.5
index da4aa3486eab..58c8d42dc5ac 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5
+++ b/metadata/md5-cache/dev-java/itext-2.1.5
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=!doc? ( !rups? ( >=virtual/jre-1.4 ) ) doc? ( !rups? ( >=virtual/jre-1.5 ) ) !doc? ( rups? ( >=virtual/jre-1.5 ) ) doc? ( rups? ( >=virtual/jre-1.5 ) ) >=dev-java/bcmail-1.38 >=dev-java/bcprov-1.38:0 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66cc248d85f07cece1bbed7e1b0a7a98
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5-r1 b/metadata/md5-cache/dev-java/itext-2.1.5-r1
index 04771597fab3..9cd9061593cb 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5-r1
+++ b/metadata/md5-cache/dev-java/itext-2.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b5827b88fefe383893076ea71c62e44
diff --git a/metadata/md5-cache/dev-java/itext-5.2.0 b/metadata/md5-cache/dev-java/itext-5.2.0
index 8103bfeffba1..b7077c15bcfc 100644
--- a/metadata/md5-cache/dev-java/itext-5.2.0
+++ b/metadata/md5-cache/dev-java/itext-5.2.0
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/bctsp: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.2.0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6a6b00152cdedd3d50c836c5c3ece2a9
diff --git a/metadata/md5-cache/dev-java/jacl-1.3.3 b/metadata/md5-cache/dev-java/jacl-1.3.3
index 088b3ccc2ca2..4b4ca4f957e3 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55ae6426069075b75f1bd02a9f20e514
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1 b/metadata/md5-cache/dev-java/jacl-1.4.1
index 45c76d142f7d..1fd5c5f40663 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53e418206d355392029946271cdcb474
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r1 b/metadata/md5-cache/dev-java/jade-3.3-r1
index 5b5c1ecd40c4..d386681531bd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b4dc73f8c4161ca075e9439e0524bdb
diff --git a/metadata/md5-cache/dev-java/jaffl-0.3 b/metadata/md5-cache/dev-java/jaffl-0.3
index a705b2c6591e..abde5b0ffd4a 100644
--- a/metadata/md5-cache/dev-java/jaffl-0.3
+++ b/metadata/md5-cache/dev-java/jaffl-0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/jffi:0.4 dev-java/jna:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jaffl-0.3.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8c12b17f03197dbe90e7e6335031b180
diff --git a/metadata/md5-cache/dev-java/jaffl-0.5.1 b/metadata/md5-cache/dev-java/jaffl-0.5.1
index c9e75c12f78a..56368ce89e05 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6cb1d77f7bd0e5961634a7fefe3e91ea
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 077143e8b521..c9caf91f1727 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a08d31efe6e1452c67cede3fb7fe431a
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r2 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r2
index 37a7e8ea2300..bc659c7e2e21 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r2
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r2
@@ -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.0
 SRC_URI=mirror://apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f2c201c6af3e7ad7a609e9d9d0c827d3
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 5a67f5cd2e17..74f2f5703e5a 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
@@ -4,10 +4,10 @@ DESCRIPTION=A set of text-processing Java classes.
 EAPI=4
 HOMEPAGE=http://jakarta.apache.org/oro/index.html
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3b30c0b76bbd2bea755c845f7b8bc361
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6cc976c863fb670b5988dbe56b91cd1f
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 0e4d0dc139a8..7f413eafda43 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebaefedf8a9f400b1a6c86de2185e8aa
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 554d58c1590a..4da3699ca724 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29a5234e020d4f821fe0e85be737e44d
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 26c2081f6911..be49fefef44e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf36f02d401473576b28d914cbe82924
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r3 b/metadata/md5-cache/dev-java/jal-20031117-r3
index 68d254e01ccc..4a3057305b4d 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r3
+++ b/metadata/md5-cache/dev-java/jal-20031117-r3
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3475937c3a772349c03588e93b2b76b
diff --git a/metadata/md5-cache/dev-java/jamon-1.01-r2 b/metadata/md5-cache/dev-java/jamon-1.01-r2
index fbefd8c38f0c..78f6f0a34733 100644
--- a/metadata/md5-cache/dev-java/jamon-1.01-r2
+++ b/metadata/md5-cache/dev-java/jamon-1.01-r2
@@ -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 >=sys-apps/portage-2.1.2.7
 SLOT=1
 SRC_URI=mirror://sourceforge/jamonapi/JAMonAll_103005.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce9ad4935d4b4eda41d46a384fb703ca
diff --git a/metadata/md5-cache/dev-java/jansi-1.1 b/metadata/md5-cache/dev-java/jansi-1.1
index debd2f25f547..515b77478d10 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=14e415d1cc872d3abbfa5f48a986373c
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7 b/metadata/md5-cache/dev-java/japitools-0.9.7
index 98901f2d8004..2b2d55f8335f 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d365feb50d3fcab681d0c87d7323d2c
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 1d51b47c5573..ceabd756e0f8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7139ce1f0f60b56285e5a01859a50747
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.7 b/metadata/md5-cache/dev-java/jarbundler-1.7
index c43044009b48..a711b364f664 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 128438d8d2fd..b0ef5b3a936c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d835e0bf241b4909ad4fcae128fe68b0
diff --git a/metadata/md5-cache/dev-java/jarjar-0.9 b/metadata/md5-cache/dev-java/jarjar-0.9
index 5d9a66dfc4e1..5ebadd86d727 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18354c34a0e403487aae48ca4776b960
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.1 b/metadata/md5-cache/dev-java/java-dep-check-0.1
index d186dcd93dae..de205ae4e08d 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.1
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/bcel:0 dev-java/commons-cli:1 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d1095528db67c31a371d44644a8c1c72
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.2 b/metadata/md5-cache/dev-java/java-dep-check-0.2
index fa308cd7d44e..3fcedbdef9ce 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.2
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.2
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e3a700f4871c768a187c6ea56e9b36b
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 9b0db25a9349..478ca939bcdf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 8b5fbcef2592..dcc4453dc3ea 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82513c23617276a338b270e26b694705
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.18-r2 b/metadata/md5-cache/dev-java/java-gnome-4.0.18-r2
index 22f4020a9f59..93073634dd2a 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.18-r2
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.18-r2
@@ -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.18.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b01c63e390dfd5d4f4e15cf95e1e49c3
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 7dc4eec9b18b..699c969ce010 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2fd5e02ca2f2d61ba93501f8318a53b
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.19-r1 b/metadata/md5-cache/dev-java/java-gnome-4.0.19-r1
index 80e35d50a6aa..77a3ca0a9415 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.19-r1
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.19-r1
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=509b54f406084110412c8c08c60adba1
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.1.1 b/metadata/md5-cache/dev-java/java-gnome-4.1.1
index 3c0bf737d9ed..054c02888f8f 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.1.1
+++ b/metadata/md5-cache/dev-java/java-gnome-4.1.1
@@ -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.1.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=0df2e21541d1233263f5133f15627260
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 ca5e0f46b395..0713c7294114 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20a5ef0baf0160e183982dee4ed20d7d
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 ab774423bb8a..825217afdcb9 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04188082c8ca9defa895b142db8405d9
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 e79028068a4c..ce3afc2075fe 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24e52ca5dccc890e2308bb74be06577b
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 e54d81a597c5..51c6473431a3 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e9ac23a844f9227a30278e3664ad158
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 47469f959a90..c4dc837cad33 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0fdd3764b2e5e4066afac479afe67984
diff --git a/metadata/md5-cache/dev-java/javacc-4.0-r4 b/metadata/md5-cache/dev-java/javacc-4.0-r4
index c8633cb3962c..0b90280356ac 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d74f3a603a0d9153db78275638a6cb17
diff --git a/metadata/md5-cache/dev-java/javacc-4.2 b/metadata/md5-cache/dev-java/javacc-4.2
index 7631054c22b2..45403564d10e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=328bb236721fee12c3e10fbde233402c
diff --git a/metadata/md5-cache/dev-java/javacc-5.0 b/metadata/md5-cache/dev-java/javacc-5.0
index 1bf16b0ce9a1..d1c5c8e178d2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=755d9fc7a6249cfd91f048a963b61507
diff --git a/metadata/md5-cache/dev-java/javacup-0.10k-r1 b/metadata/md5-cache/dev-java/javacup-0.10k-r1
index a74218936da0..7371214037c3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 b78106212f64..b657a755f810 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72b619afead8b2d7cfaf029c79763e34
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 d270fe866755..3d0a58cfa421 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28f721e27a6e8a6a17bf9c400493f7f6
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r1 b/metadata/md5-cache/dev-java/javassist-2.6-r1
index b02fea920038..b80834c9403e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0853a908e7914d645810d0c98e714753
diff --git a/metadata/md5-cache/dev-java/javassist-3.14.0 b/metadata/md5-cache/dev-java/javassist-3.14.0
index 4ea69d1860c3..99a90e5998ff 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=992714e94c1032d931e48a297cfd08c5
diff --git a/metadata/md5-cache/dev-java/javassist-3.4 b/metadata/md5-cache/dev-java/javassist-3.4
index 111c4a4b5ec5..161336f92558 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83cd3a1a5b438a98bf0fe538ab5434d1
diff --git a/metadata/md5-cache/dev-java/javassist-3.7 b/metadata/md5-cache/dev-java/javassist-3.7
index e780e3150b8d..c348caef6e07 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3408ede12171dfa0c757ff6324b7a180
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 0b8068e42be6..25bbf686bcea 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4864330cef0cb28aba24cfaba7b6b3d6
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2 b/metadata/md5-cache/dev-java/javolution-4.0.2
index 45ab0c643938..bebc02a901a1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08895c309df38dbd9a3411030a7a98cd
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 25979ffb7fea..64e9ccf0e517 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4e4df52ac827..2c16500f6f0d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a755ac560f5c..954776418482 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 bd8ba2686e77..1cef4a6b8042 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eba2d6691f764b79ce953e45ede78e14
diff --git a/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1 b/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1
index ddb38026972d..506bf140e153 100644
--- a/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1
+++ b/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime dev-java/istack-commons-tools dev-java/stax-ex dev-java/xmlstreambuffer =dev-java/jaxb-2* =dev-java/jaxb-tools-2* dev-java/txw2-runtime dev-java/jsr173 >=dev-java/jsr181-1.0 dev-java/jsr250 =dev-java/sun-httpserver-bin-2* dev-java/jsr67 dev-java/saaj dev-java/sjsxp dev-java/xml-commons-resolver =dev-java/jax-ws-api-2* =dev-java/jax-ws-2* =dev-java/codemodel-2* dev-java/apt-mirror >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=88839fb09f02d5b3f023f99c6ab85c81
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 3bbdaceb93b3..33b3736fd580 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a0c0170e9e78..7767e1189149 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df626bb122449d6decb5cf51020ab09e
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 bcfe87488930..edeaa3480ade 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99027b63e5b27db59bf29336c7727779
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.1 b/metadata/md5-cache/dev-java/jaxen-1.1.1
index 6f8638be6100..c78f2a68b2c5 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=jaxen
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ed91685d6869d2a7db03a3099905e62
diff --git a/metadata/md5-cache/dev-java/jaxme-0.3.1-r4 b/metadata/md5-cache/dev-java/jaxme-0.3.1-r4
index 355552eb6be5..bebf6177ad38 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.3.1-r4
+++ b/metadata/md5-cache/dev-java/jaxme-0.3.1-r4
@@ -8,5 +8,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 =dev-java/junit-3.8* dev-java/gn
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.3.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=582512d56552723a7dad091fae7f856d
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2 b/metadata/md5-cache/dev-java/jaxme-0.5.2
index 4780973b3615..d5d7397d0691 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=181ded8106cd1714f217f3d8563810d7
diff --git a/metadata/md5-cache/dev-java/jaxp-1.4 b/metadata/md5-cache/dev-java/jaxp-1.4
index b1d2132d9a48..ab86615d04ed 100644
--- a/metadata/md5-cache/dev-java/jaxp-1.4
+++ b/metadata/md5-cache/dev-java/jaxp-1.4
@@ -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/jaxp-1.4.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1602a82c00b69b1c5bf81ed59856739e
diff --git a/metadata/md5-cache/dev-java/jaxp-1.4-r1 b/metadata/md5-cache/dev-java/jaxp-1.4-r1
index ed5ad8cd4d8d..839a6077ab9c 100644
--- a/metadata/md5-cache/dev-java/jaxp-1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxp-1.4-r1
@@ -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/jaxp-1.4.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93dbbbbc0d26f5784f802f196cbde332
diff --git a/metadata/md5-cache/dev-java/jaxr-1.0.6 b/metadata/md5-cache/dev-java/jaxr-1.0.6
index 6a11e3bf73a5..6dc9baeb71b3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 cb2ed9a79f72..8ae4c792927f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 dc464267eda4..407e2d84fad6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9d831b1c2d2541ac2adf44ccacf5f6e
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.3.2 b/metadata/md5-cache/dev-java/jcalendar-1.3.2
index 85818409d29f..9298b826f570 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.3.2
+++ b/metadata/md5-cache/dev-java/jcalendar-1.3.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 =dev-java/jgoodies-looks-1.2* >=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.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6841dd8ded6695bb1851dc0a77db4b36
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.3.2-r1 b/metadata/md5-cache/dev-java/jcalendar-1.3.2-r1
index b58b866f3875..6d2f11d1d773 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.3.2-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.3.2-r1
@@ -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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.3.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f6701609e29e6ad2089c38a7913b6d9
diff --git a/metadata/md5-cache/dev-java/jchardet-1.1 b/metadata/md5-cache/dev-java/jchardet-1.1
index 926607c1b63f..02ebc3690421 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=507377711b7ec07102fd193697b1e9f7
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r1 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r1
index 9dc876f8f05a..8286242baabd 100644
--- a/metadata/md5-cache/dev-java/jcharts-0.7.5-r1
+++ b/metadata/md5-cache/dev-java/jcharts-0.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/batik:1.7 dev-java/servletapi:2.4 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eec8e1163f21613c66691e3ca22d9179
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 f7409e551349..d86b1f148d7b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=683969ce58fc5b412ee4f681c3d599b7
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.13 b/metadata/md5-cache/dev-java/jcifs-1.3.13
index d76f7693bbca..e9d69fd32ebe 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.13
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/servletapi: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.13.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0105a6797a9b50d554c8d469b137e13c
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.15 b/metadata/md5-cache/dev-java/jcifs-1.3.15
index 59b5e76a6a90..775964181820 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.15
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/servletapi: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.15.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8c4181e3b56dec8e5962a3856cdfd31f
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 0f6e10a73cb4..fa69ed75c93a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e7c4c0c86f79ec9db0ed90b3c05e20ac
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.0-r1 b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
index da6448f39231..b11d1f0a71fd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ebdd3912513e27a9f5afa14e70f9e7f7
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 aa96c765cda0..e4ac66bf8e43 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e73f534daa1239a2995c886c7982bf42
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.2 b/metadata/md5-cache/dev-java/jcodings-1.0.2
index a34ed02a1546..0f699c992904 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.2
+++ b/metadata/md5-cache/dev-java/jcodings-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=0
 SRC_URI=mirror://gentoo/jcodings-1.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=657d48e3c90ca1d81bf0d5c96f63d047
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index 2f3412efbba3..ecf4195f0421 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 84f0e34c63f6..49ed625ad76d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d90255b72a474c934d1be88c64c5e2f
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.12 b/metadata/md5-cache/dev-java/jcommon-1.0.12
index 1d613908f635..740c9fff1e98 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.12
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.12
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.12.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bec9f9f0f5c7f8958151d07e5ba2b74a
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.13 b/metadata/md5-cache/dev-java/jcommon-1.0.13
index c5dd8b2c4658..65684a2ba245 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.13
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.13.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18c497020f7ece2b7683240d4638c125
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.16 b/metadata/md5-cache/dev-java/jcommon-1.0.16
index ef9d1b34c573..ed7252a517fe 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3369fa37f6d802833c68e9d3ce209d3a
diff --git a/metadata/md5-cache/dev-java/jcs-1.2.7.9 b/metadata/md5-cache/dev-java/jcs-1.2.7.9
index 25d988e9d6f2..8861fc32f768 100644
--- a/metadata/md5-cache/dev-java/jcs-1.2.7.9
+++ b/metadata/md5-cache/dev-java/jcs-1.2.7.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/jisp-2.5* =dev-java/servletapi-2.3* dev-db/hsqldb dev-java/commons-dbcp =dev-java/commons-lang-2.0* dev-java/commons-logging dev-java/commons-pool dev-java/concurrent-util dev-java/jgroups dev-java/xmlrpc admin? ( dev-java/velocity ) >=dev-java/java-config-2.1.9-r1
 SLOT=1.2
 SRC_URI=mirror://gentoo/jcs-1.2.7.9.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2dd70d12345bba4690552fbbb878747
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 ab407fc8d8e9..f3bbcdbfcde8 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 dev-java/commons-lang:0 dev-java/commons-logging dev-java/commons-pool dev-java/concurrent-util dev-java/jgroups dev-java/xmlrpc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1b42cf355d517e52d62db991e90ed84
diff --git a/metadata/md5-cache/dev-java/jcs-1.3 b/metadata/md5-cache/dev-java/jcs-1.3
index 0224f43739d1..6017681b1a9a 100644
--- a/metadata/md5-cache/dev-java/jcs-1.3
+++ b/metadata/md5-cache/dev-java/jcs-1.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-lang-2.0* =dev-java/jisp-2.5* =dev-java/servletapi-2.3* dev-db/hsqldb dev-java/commons-dbcp dev-java/commons-logging dev-java/commons-pool dev-java/concurrent-util dev-java/xmlrpc admin? ( dev-java/velocity ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/jcs/source/jcs-1.3-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c012e86c0dd0be57977f8acb19d72588
diff --git a/metadata/md5-cache/dev-java/jcs-1.3-r1 b/metadata/md5-cache/dev-java/jcs-1.3-r1
index e1ae5b4f913f..e7126e078c7e 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 dev-java/commons-logging dev-java/commons-pool dev-java/concurrent-util dev-java/xmlrpc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f06f0adceaa59420aad55195d28364e
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 6f72ad2373a7..451e183da49b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 78175c819598..0724386abe26 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 28391c5c8829..f37ab2cbea6e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f763ec328bed..b512b9a70619 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18a0ea0d3d1f39927ce9b4079f83b419
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-2.2.0040-r1 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-2.2.0040-r1
index 5b6dbb32356a..ddf131b7baf1 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-2.2.0040-r1
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-2.2.0040-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.1 >=dev-java/java-config-2.1.9-r1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.microsoft.com/download/4/1/d/41d3e9c0-64d1-451e-947b-7a4cba273b2d/mssqlserver.tar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ffb49a2d1c2b855aaec2aa1a5953001a
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-2005.1.2.2828.100 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-2005.1.2.2828.100
index bb869dc7c90a..bef2acab45bd 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-2005.1.2.2828.100
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-2005.1.2.2828.100
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 RESTRICT=mirror
 SLOT=2005
 SRC_URI=http://download.microsoft.com/download/C/D/3/CD301BF5-E28F-45EA-A1DA-53F2EB448D78/sqljdbc_1.2.2828.100_enu.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43287eeb042976270b18d12e2f595b9d
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 982a3aa55846..4165b2f54482 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04891a69a70aa9125d66d2485553ff00
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 e186ef5aebe4..bdc1f54a6451 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ad1f084b93a13b53e287207962d1589
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 3170a5c30667..27013a919397 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 fc1b44eea6e2..6c0be1b646b0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 acfab78b6c79..88db5a87d364 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 fb444fdbacf9..9617d4f17e72 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 c13bddd30ccb..a2cf285bf00e 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
@@ -8,5 +8,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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72511f1cdafbaccd179c9c88edaa5d0d
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p605 b/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p605
index c71cd0287720..fb54a411549f 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p605
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p605
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=java6? ( >=virtual/jre-1.6 ) !java6? ( >=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-605.src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=02d16d5498ce24517eae665fa0383b92
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 a4451b89fcfe..404e593787aa 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be39183c9949d3d49bf5211b50872237
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.0_p801 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.0_p801
index d9cda25b1402..c8e767b85322 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.0_p801
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.0_p801
@@ -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.0-801.src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc56ad21410038f90a5acbb90189d653
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p901 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p901
index 6b8c27714c57..524391d9c5c8 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p901
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p901
@@ -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.1-901.src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e054b793a91adabd2762d42060c60699
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p902 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p902
index c536e1e4ad16..f183239caa50 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p902
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.1_p902
@@ -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.1-902.src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a88cece4e1593fea164c9ca9531b85d2
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index 4120f4cb6339..03597f8ed433 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f50147477295..abd1ccf2d08b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f20d8da2abdc0b252ef5e292fa912367
diff --git a/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r2 b/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r2
index c9e3801d1914..861db5b40be8 100644
--- a/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r2
+++ b/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r2
@@ -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=https://jdic.dev.java.net/files/documents/880/16466/jdic-0.9.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=75c39218948c37bebd5d9d3573b4c232
diff --git a/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r3 b/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r3
index 3a2481dbcb99..79784aa6751b 100644
--- a/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r3
+++ b/metadata/md5-cache/dev-java/jdictrayapi-0.9.1-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( =virtual/jre-1.4* =virtual/jre-1.5* ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdic.dev.java.net/files/documents/880/16466/jdic-0.9.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=694815bbebf5097e4ffb150afe4fd350
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index a0080c53672b..85bacfe0bcc7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 e79a88903d72..7f436768e394 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e551b2a33d0b77ccaf0c91c269bebea
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 6e49cdb31307..2be425e258f7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5d3a0f13aff2..40c1f1753e81 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 3dfcfe6a1c44..fa88ad43ba95 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 0a3c35ccb8b9..379fa5387af2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba6353231ba2b0eb4bc3c1a2158ee936
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 83edeecdc61f..e6b9d7868bbc 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fa7755c4128752dbc3fad5247ee60c9
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 759ebadd6d51..0a9d18b75073 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0be8074b33f17ea10258fb7cf3614fe3
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 691b66121c33..db7696459fe9 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f94f72dd4ab5171b38420741863fc4d
diff --git a/metadata/md5-cache/dev-java/jdynamite-1.2 b/metadata/md5-cache/dev-java/jdynamite-1.2
index 560ccdaabbb7..d8e0cf01f83f 100644
--- a/metadata/md5-cache/dev-java/jdynamite-1.2
+++ b/metadata/md5-cache/dev-java/jdynamite-1.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.2 >=dev-java/gnu-regexp-1.0.8 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e612e94ed7486cb64d0ba42bcedf67ff
diff --git a/metadata/md5-cache/dev-java/jebl-0.5.3 b/metadata/md5-cache/dev-java/jebl-0.5.3
index 76039cd68e24..1fbb41e22530 100644
--- a/metadata/md5-cache/dev-java/jebl-0.5.3
+++ b/metadata/md5-cache/dev-java/jebl-0.5.3
@@ -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://gentoo/jebl-0.5.3.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a2938becd49e495bbd88feac7a1241e
diff --git a/metadata/md5-cache/dev-java/jebl-2009.09.22 b/metadata/md5-cache/dev-java/jebl-2009.09.22
index 9017f77dc5f1..0755fccff779 100644
--- a/metadata/md5-cache/dev-java/jebl-2009.09.22
+++ b/metadata/md5-cache/dev-java/jebl-2009.09.22
@@ -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://gentoo/jebl-2009.09.22.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a38f6b400519fb7fc787704fba9a4d77
diff --git a/metadata/md5-cache/dev-java/jebl-9999 b/metadata/md5-cache/dev-java/jebl-9999
index ac5766804580..08c3988a81c7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 7fba788d4b86..e6f422aaf162 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=152f169024e617040714a4ceadcbaf85
diff --git a/metadata/md5-cache/dev-java/jettison-1.0 b/metadata/md5-cache/dev-java/jettison-1.0
index 1fe311c88e6e..001f21f9855e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f51325f63e80..4af9181ab80e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df2ed21019559ecd7f5e3120f2c4a179
diff --git a/metadata/md5-cache/dev-java/jffi-0.6.0.2 b/metadata/md5-cache/dev-java/jffi-0.6.0.2
index eb449f7b05ea..7daeddab00ff 100644
--- a/metadata/md5-cache/dev-java/jffi-0.6.0.2
+++ b/metadata/md5-cache/dev-java/jffi-0.6.0.2
@@ -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-0.6.0.2.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c75110fcc63bf0dce89cbb73f982f07a
diff --git a/metadata/md5-cache/dev-java/jffi-0.6.0.2-r1 b/metadata/md5-cache/dev-java/jffi-0.6.0.2-r1
index 15c063a5db6f..81ff46d22b86 100644
--- a/metadata/md5-cache/dev-java/jffi-0.6.0.2-r1
+++ b/metadata/md5-cache/dev-java/jffi-0.6.0.2-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-0.6.0.2.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57d2cfc2f77dfe924e65340650330a79
diff --git a/metadata/md5-cache/dev-java/jffi-0.7_pre20100131 b/metadata/md5-cache/dev-java/jffi-0.7_pre20100131
index 63f4ff0f33e4..a8fdb71c3dcf 100644
--- a/metadata/md5-cache/dev-java/jffi-0.7_pre20100131
+++ b/metadata/md5-cache/dev-java/jffi-0.7_pre20100131
@@ -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=http://github.com/wmeissner/jffi/tarball/6c5fb4a241a747f7c8561156ed81fbee52a0174f -> jffi-git-0.7_pre20100131.tgz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f89e6c8625ef0447df2432572c0f4be
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.0 b/metadata/md5-cache/dev-java/jffi-1.0.0
index 8e85fe3c0892..e2945b5c782d 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01c49897f7d884ddea9c83593d0f67fa
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.11 b/metadata/md5-cache/dev-java/jffi-1.0.11
index 7c3f3d265784..afe7732c4cbd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a7f5e8669c4a510f5a3ef34449b230f
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.2 b/metadata/md5-cache/dev-java/jffi-1.2.2
index 49dffd3430a0..01c32cfdce98 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.2
+++ b/metadata/md5-cache/dev-java/jffi-1.2.2
@@ -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.2 -> jffi-1.2.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=221cb726b8ba516e198a0cd7dcf5ba1a
diff --git a/metadata/md5-cache/dev-java/jflex-1.4.1-r1 b/metadata/md5-cache/dev-java/jflex-1.4.1-r1
index f99ddff64a8a..1e47441ce941 100644
--- a/metadata/md5-cache/dev-java/jflex-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.4.1-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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jflex/jflex-1.4.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1038dd5ee55fd1f32be798124b009fb7
diff --git a/metadata/md5-cache/dev-java/jflex-1.4.3 b/metadata/md5-cache/dev-java/jflex-1.4.3
index fe10992e0d84..f6c6d7b4bb01 100644
--- a/metadata/md5-cache/dev-java/jflex-1.4.3
+++ b/metadata/md5-cache/dev-java/jflex-1.4.3
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9808f628b856f15b3ddb27d7d17294b
diff --git a/metadata/md5-cache/dev-java/jformatstring-0.9 b/metadata/md5-cache/dev-java/jformatstring-0.9
index e1734d662978..15d5bbaab974 100644
--- a/metadata/md5-cache/dev-java/jformatstring-0.9
+++ b/metadata/md5-cache/dev-java/jformatstring-0.9
@@ -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/jformatstring-0.9.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1d05a15e4e51c8476d008df125490cf
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.13 b/metadata/md5-cache/dev-java/jfreechart-1.0.13
index f7393fddb885..51144ffea5d5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eca112c5c9710a8e8046fda4a62ae2a5
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 edc2902f72a8..ee99d545c412 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30dc83055328fdab9dde575da240fe00
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 e961ca5b6654..c2f44adc66a0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7355277827720db91a4073a990fd70d5
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 95740945c210..fd8a431074cb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ef226406839e63dcf59f5c107935c8fc
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.1.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.1.0
index dabf0eea4a38..456e6195acc2 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.1.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.1.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_1_0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0d5864e496ae2601938f28f9b2aba08
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 f5b61c0f7478..b25917f8ffa0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91a4699d59a71ebb9cd707e9d04b1c5a
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 5c476379b0a1..fa2b410de581 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f1a78e35921ec4fdba8ae9159c234780
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 0d62ff5ff183..7515dd13f586 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8006d561a7dce4f9323410d0897dca61
diff --git a/metadata/md5-cache/dev-java/jgraph-5.10.1.2 b/metadata/md5-cache/dev-java/jgraph-5.10.1.2
index 41637ab52cfb..2cf1d0503bda 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.10.1.2
+++ b/metadata/md5-cache/dev-java/jgraph-5.10.1.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/jgraph/jgraph-5.10.1.2-lgpl-src.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d079fb9f9a78167c739ce45e993ae69
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 73e0bdd912f6..11406cc67ef3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9baf7961740870eb03187bdb90cac30
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.7.3 b/metadata/md5-cache/dev-java/jgrapht-0.7.3
index eaba79498125..7bf81fed707a 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.7.3
+++ b/metadata/md5-cache/dev-java/jgrapht-0.7.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.7.3.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97f5da7b15baf160a18de35de40ff3c9
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.2 b/metadata/md5-cache/dev-java/jgrapht-0.8.2
index 85ac2c8a61f0..98851595d42a 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.8.2
+++ b/metadata/md5-cache/dev-java/jgrapht-0.8.2
@@ -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.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=02a902b6db63e34ea0d6885de1fa58f0
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index cb72989fcddb..e85038e7f91a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a16fa9d74073b67d2d1155dbd77c4afe
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 6d9fb9049759..779238f2e5f5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a3378c09cc0a7c4610cc1328bae5d2f
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 89b53d034e73..30feea71268b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c0c9a244bcc4a0aa51fe16a58f11f08
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index 387094d63469..6b25eb54880c 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	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 2b8a36977511..f76ce7739802 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e254fa8e970b131c1c53d5e50c584ab
diff --git a/metadata/md5-cache/dev-java/jigsaw-2.2.6 b/metadata/md5-cache/dev-java/jigsaw-2.2.6
index 0a06e8b8241d..00a52b6dde0f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f5451f9feb0de5e498b88ac914149e5
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index 426fa3999d42..d59602a80486 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b453f45a544b7c727832bb27e115225c
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 88e102f77b32..965de8e26f9e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a7fc87eaa555696da00d00c106c19273
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 f21dd0cb395d..8d6bd2887f0c 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 65236cd40224..5ef5cec42173 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87d00cf6667e9cf59e99c4c6216eef82
diff --git a/metadata/md5-cache/dev-java/jldap-20060300 b/metadata/md5-cache/dev-java/jldap-20060300
index d845ec8fe181..bec743bf1573 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 70d1394ea74d..df7246ede63c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9d72db367280b517f7de276c8193b9e1
diff --git a/metadata/md5-cache/dev-java/jlfgr-1.0-r1 b/metadata/md5-cache/dev-java/jlfgr-1.0-r1
index 9a5c08420525..0fe26d7ccec8 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac56e15579f053e0ca9cdbf7fa82744b
diff --git a/metadata/md5-cache/dev-java/jline-0.9.91 b/metadata/md5-cache/dev-java/jline-0.9.91
index 1b5ba36a7ccc..4b396180b0b8 100644
--- a/metadata/md5-cache/dev-java/jline-0.9.91
+++ b/metadata/md5-cache/dev-java/jline-0.9.91
@@ -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/jline/jline-0.9.91.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e22294c5732c7b407d12c4beaf5b6a3c
diff --git a/metadata/md5-cache/dev-java/jline-0.9.94 b/metadata/md5-cache/dev-java/jline-0.9.94
index 2f9de5da2e31..e33cfabc1cc9 100644
--- a/metadata/md5-cache/dev-java/jline-0.9.94
+++ b/metadata/md5-cache/dev-java/jline-0.9.94
@@ -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-0.9.94.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a4553792aca3f8f93d23ebcb1a6f6b8c
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index 11a7f0452442..6200df5abe4f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a458d78fd29e869e442cb052cbe62c3
diff --git a/metadata/md5-cache/dev-java/jmdns-1.0 b/metadata/md5-cache/dev-java/jmdns-1.0
index e42e962da416..7b524bd113f4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ce7d93348a8ea68ac183d35bd5d7077
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 60a2fe561418..9a59e1be85b8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 bbee49fece6f..bbc5475489c8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 aba5bebba432..3d241840b2e3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4db9faae5155706a338e53c18e430e06
diff --git a/metadata/md5-cache/dev-java/jna-3.0.3-r1 b/metadata/md5-cache/dev-java/jna-3.0.3-r1
index 80f4db87e8f2..99dc9325d4e6 100644
--- a/metadata/md5-cache/dev-java/jna-3.0.3-r1
+++ b/metadata/md5-cache/dev-java/jna-3.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libffi >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jna-3.0.3.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e629cc5006a0f8a4b336243ce08572a9
diff --git a/metadata/md5-cache/dev-java/jna-3.2.4 b/metadata/md5-cache/dev-java/jna-3.2.4
index 7b46339e0bd0..ff5e29078b7a 100644
--- a/metadata/md5-cache/dev-java/jna-3.2.4
+++ b/metadata/md5-cache/dev-java/jna-3.2.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libffi >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jna-3.2.4.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bed5b97c392160f265c35c4a2c15c5e
diff --git a/metadata/md5-cache/dev-java/jna-3.4.0 b/metadata/md5-cache/dev-java/jna-3.4.0
index 87f54cf9abe9..ddd23fede817 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-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1379f125d043d4246f8c7b58099469b0
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 4be9996f38b8..f854c4afdc6a 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-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85991518af4d558482fd886726f7d386
diff --git a/metadata/md5-cache/dev-java/jna-posix-1.0 b/metadata/md5-cache/dev-java/jna-posix-1.0
index 37644f0c5f93..e0f7fbf3ba8e 100644
--- a/metadata/md5-cache/dev-java/jna-posix-1.0
+++ b/metadata/md5-cache/dev-java/jna-posix-1.0
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/jna:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jna-posix-1.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fbcd149ffe991c94ff878daa10b59bf4
diff --git a/metadata/md5-cache/dev-java/jna-posix-1.0.1 b/metadata/md5-cache/dev-java/jna-posix-1.0.1
index ed971860524d..afbe3e33b0e0 100644
--- a/metadata/md5-cache/dev-java/jna-posix-1.0.1
+++ b/metadata/md5-cache/dev-java/jna-posix-1.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/jna:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jna-posix-1.0.1.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df51702da8885430b82bca27c8fff3a6
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 dd59120f4244..5f994562eba1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d85649e2f8a13a54958e1c768e1ce11d
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 d57a296bd0e6..8b61a7c60622 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c27ebdebcc0b030263887aa10858a121
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 bd420948aaa1..c14efd936fa4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=221555931d8d2b5819335fe7b1627e37
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 d174068b9ac0..1e52ea578451 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c1339b104208da7a474d60aec909e8c
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 95230dd08b38..776bbc5a2050 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30489cf0529e816eebd329fedb4b4ad3
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.4 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.4
index 1c36a7d1c51a..fdb19723b496 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.4
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.4
@@ -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.4 -> jnr-ffi-0.7.4.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccf4ca8533efe6a623c2b01416c083fd
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 65892f971a56..bdbdbcc38be5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb2cfdffc8ca82a70ef55eca6d455c04
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 bf6d03830f91..4cdde5b63d96 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59bdc12ec21debd498e6a9d038489b98
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 7031e79652a1..f9795ab613a4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab1204d819e60628482af9fbc961b661
diff --git a/metadata/md5-cache/dev-java/jnr-posix-1.1.8 b/metadata/md5-cache/dev-java/jnr-posix-1.1.8
index 52c46cbf2b2e..0231a81bc429 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-1.1.8
+++ b/metadata/md5-cache/dev-java/jnr-posix-1.1.8
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=307c5d8b1c0c71e6659ead4c737d8150
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 c620bb2e7463..3a323f81d3eb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=874e7e4a56ec9e6c473688aa4b8f0142
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.1 b/metadata/md5-cache/dev-java/jnr-posix-2.1
index 7c8c44c01b36..da7ac9de5cb3 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.1
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.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=2.1
 SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.1 -> jnr-posix-2.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=205d95c23eef38c86ca55b7daf6741d3
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-0.1 b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
index 12c6ac458010..a51559025629 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1eb748111469ea8405546f4780e13ec6
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 0b6e62cec69f..a429d2df5c7f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e9cb2219c63f26e9a22ec07bbd7f3e80
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 c6db69435b49..348421ba06d2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=676ed7b071859f1016d97f498c19c2a2
diff --git a/metadata/md5-cache/dev-java/joda-time-1.5.1 b/metadata/md5-cache/dev-java/joda-time-1.5.1
index 8c609dae9a10..39a930092645 100644
--- a/metadata/md5-cache/dev-java/joda-time-1.5.1
+++ b/metadata/md5-cache/dev-java/joda-time-1.5.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 elibc_glibc? ( >=sys-libs/timezone-data-2007h ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-1.5.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3ca53a26ca45c321b8a32f7c15b9866
diff --git a/metadata/md5-cache/dev-java/joda-time-1.5.2 b/metadata/md5-cache/dev-java/joda-time-1.5.2
index 7c0c0bc656af..027114c63dfe 100644
--- a/metadata/md5-cache/dev-java/joda-time-1.5.2
+++ b/metadata/md5-cache/dev-java/joda-time-1.5.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 elibc_glibc? ( >=sys-libs/timezone-data-2007h ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-1.5.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31def994852d08b1572050b03a5cbec6
diff --git a/metadata/md5-cache/dev-java/joda-time-1.6 b/metadata/md5-cache/dev-java/joda-time-1.6
index af5b42ed7812..39ae3f21cee6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=acc5f3b3055ca036f72138a3fb64a0a6
diff --git a/metadata/md5-cache/dev-java/joni-1.1.4 b/metadata/md5-cache/dev-java/joni-1.1.4
index 0c54e3250a4d..68e977e654b2 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec986429725d70a83b6f3b33799bb0f3
diff --git a/metadata/md5-cache/dev-java/jpf-1.5.1 b/metadata/md5-cache/dev-java/jpf-1.5.1
index 1dfd72b936a6..6e6d39a4d0c7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7fa4c25e5d2da5cb25d80023cbb9fdf
diff --git a/metadata/md5-cache/dev-java/jpfcodegen-0.4 b/metadata/md5-cache/dev-java/jpfcodegen-0.4
index 6b44285889ee..83d0ace48224 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dea64f874f49e0f47b107f37b07c6786
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r1 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r1
index e91d3be30f7e..2544f9d00e5e 100644
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-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
 SLOT=0
 SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58a76e647ff5de225c6517c7b56f7d63
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 cc4f004624a6..a3ce639f8f3f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=845b46588da457e7b2c8b67b13c80367
diff --git a/metadata/md5-cache/dev-java/jrobin-1.5.14 b/metadata/md5-cache/dev-java/jrobin-1.5.14
index 88b2e7d4ed51..5ec5d1a54f41 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0791b8e086aa818ddf52f965826ac84
diff --git a/metadata/md5-cache/dev-java/jrobin-1.5.4 b/metadata/md5-cache/dev-java/jrobin-1.5.4
index 87fa4b666dd8..708272199fa7 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.5.4
+++ b/metadata/md5-cache/dev-java/jrobin-1.5.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://sourceforge/jrobin/jrobin-1.5.4-1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=23131b1a13172098d5cc464058baf52b
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 77244ddeef9a..3ba78b5935cf 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	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=adb778d9dc53b0bfc4fc3a4d2389fddd
diff --git a/metadata/md5-cache/dev-java/jruby-1.4.1 b/metadata/md5-cache/dev-java/jruby-1.4.1
index d268be30b29e..9bb84993dcdc 100644
--- a/metadata/md5-cache/dev-java/jruby-1.4.1
+++ b/metadata/md5-cache/dev-java/jruby-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bytelist-1.0.2:0 >=dev-java/constantine-0.6:0 >=dev-java/jlin
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.4.1/jruby-src-1.4.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b608328d2e1f290de6b8c016b48f1d93
diff --git a/metadata/md5-cache/dev-java/jruby-1.5.6 b/metadata/md5-cache/dev-java/jruby-1.5.6
index 0dbd1104206d..33fc4c7c88f9 100644
--- a/metadata/md5-cache/dev-java/jruby-1.5.6
+++ b/metadata/md5-cache/dev-java/jruby-1.5.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bytelist-1.0.6:0 >=dev-java/constantine-0.6:0 >=dev-java/jlin
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.5.6/jruby-src-1.5.6.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bfca239c60dcfd90cd9ffc9c3f2c460c
diff --git a/metadata/md5-cache/dev-java/jruby-1.6.5.1 b/metadata/md5-cache/dev-java/jruby-1.6.5.1
index 1dd99bf5ce1f..ca5089040a6e 100644
--- a/metadata/md5-cache/dev-java/jruby-1.6.5.1
+++ b/metadata/md5-cache/dev-java/jruby-1.6.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bytelist-1.0.8:0 >=dev-java/jline-0.9.94:0 >=dev-java/joni-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-src-1.6.5.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7b3e010680b3b4e74ce1fddab5ead62
diff --git a/metadata/md5-cache/dev-java/jruby-1.6.7.2 b/metadata/md5-cache/dev-java/jruby-1.6.7.2
index 5bbb6d0934c4..b701b7e35f68 100644
--- a/metadata/md5-cache/dev-java/jruby-1.6.7.2
+++ b/metadata/md5-cache/dev-java/jruby-1.6.7.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bytelist-1.0.8:0 >=dev-java/jline-0.9.94:0 >=dev-java/joni-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-src-1.6.7.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6fa67e4b70a20b096c82ca83c978b7b6
diff --git a/metadata/md5-cache/dev-java/jsap-2.1 b/metadata/md5-cache/dev-java/jsap-2.1
index 3447117517b2..48e0f23c59d9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 6511c14d2ad6..0a83ba48effb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3054c7367c967995ffc2ad4f0c1f5526
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.44 b/metadata/md5-cache/dev-java/jsch-0.1.44
index b5883719098d..8aba203297ad 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ee6c1fe4d9505459a5c8d5f7ddf3ca65
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 88c6f85bb7ee..3dfc23252977 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7f22c9f22f9125819b0f26b02fb1e26
diff --git a/metadata/md5-cache/dev-java/json-simple-1.0_pre20080420 b/metadata/md5-cache/dev-java/json-simple-1.0_pre20080420
index b2a9ecdff46d..86f8e4e2ea42 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.0_pre20080420
+++ b/metadata/md5-cache/dev-java/json-simple-1.0_pre20080420
@@ -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://gentoo/json_simple-20080420.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4188315b2684eb8474450c2b6002cc8d
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 0345c93907ea..a1e9295643d7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f02f6d33ca32beade7aabb0c1901306d
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r1 b/metadata/md5-cache/dev-java/jsr101-1.4-r1
index 0b3c15ca85f4..46681094f6f1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 9b75712893f0..9eeb105586e3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7c9916bb874bb469d1e32ecaf7ba49c2
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0 b/metadata/md5-cache/dev-java/jsr181-1.0
index 8e1f32f2dd3b..995bfb1ae5e5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f9aeeb2b696e276bf11fc7e5115918d
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0 b/metadata/md5-cache/dev-java/jsr223-1.0
index 92604e8852c9..7367769e123f 100644
--- a/metadata/md5-cache/dev-java/jsr223-1.0
+++ b/metadata/md5-cache/dev-java/jsr223-1.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sjp-1_0-fr-ri.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c763bcc68bd966e893bebb96c7a8fa6d
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r1 b/metadata/md5-cache/dev-java/jsr223-1.0-r1
index f95cfb9d9c4b..f27269da8ad4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0b613bf3b85cf77d1d3815378015ee0
diff --git a/metadata/md5-cache/dev-java/jsr250-1.0 b/metadata/md5-cache/dev-java/jsr250-1.0
index 5064c6e3d19f..044d922a0abd 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f6808213b2a3..1c8679a42c03 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e2a1d99de440bb2e2fe727e57e5da7b
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.0 b/metadata/md5-cache/dev-java/jsr311-api-1.0
index 6b31e4b8de41..976ad7af8ca9 100644
--- a/metadata/md5-cache/dev-java/jsr311-api-1.0
+++ b/metadata/md5-cache/dev-java/jsr311-api-1.0
@@ -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.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5450d7110b4b71dad0d832502cb0c5ad
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.0-r1 b/metadata/md5-cache/dev-java/jsr311-api-1.0-r1
index 3139e426fbfb..ba04d5c6a4df 100644
--- a/metadata/md5-cache/dev-java/jsr311-api-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr311-api-1.0-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=0
 SRC_URI=mirror://gentoo/jsr311-api-1.0-src.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e510e8124e424b95bb94163f75ac1a5f
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.1 b/metadata/md5-cache/dev-java/jsr311-api-1.1
index d4bdcb6ad8c5..4d3479ff36ab 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=07e6d5ca813ff788179d82f51ff08e1f
diff --git a/metadata/md5-cache/dev-java/jsr67-1.3 b/metadata/md5-cache/dev-java/jsr67-1.3
index eee2e105e733..4b23305b4362 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5f00f5c0f56ee342f2d7999c4004eff
diff --git a/metadata/md5-cache/dev-java/jsr93-1.0 b/metadata/md5-cache/dev-java/jsr93-1.0
index f8ce4337c6e4..5f94f41954a3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 341a3b2bb7cd..901f40568877 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=275a2dd7e2365f9a2ed58217d283ef1e
diff --git a/metadata/md5-cache/dev-java/jss-4.3 b/metadata/md5-cache/dev-java/jss-4.3
index 2efc62c5fc1a..0fb4349a902c 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f4db2f5b01852543b52fdab7fa4dea1
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 100c5eeb2e84..65a852557fad 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8d5745c2bc48feb49c4611a4bfd22339
diff --git a/metadata/md5-cache/dev-java/jtds-1.2.4 b/metadata/md5-cache/dev-java/jtds-1.2.4
index 4e9e641ea2fa..2aae5b4c9cca 100644
--- a/metadata/md5-cache/dev-java/jtds-1.2.4
+++ b/metadata/md5-cache/dev-java/jtds-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 =dev-java/jcifs-1* dev-java/junit:0 >=dev-java/java-co
 RESTRICT=test
 SLOT=1.2
 SRC_URI=mirror://sourceforge/jtds/jtds-1.2.4-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52db1d58652fdd7247ac568936881448
diff --git a/metadata/md5-cache/dev-java/jtds-1.2.5 b/metadata/md5-cache/dev-java/jtds-1.2.5
index 39a93e09cc4c..852b082434f9 100644
--- a/metadata/md5-cache/dev-java/jtds-1.2.5
+++ b/metadata/md5-cache/dev-java/jtds-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 =dev-java/jcifs-1* >=dev-java/java-config-2.1.9-r1 sou
 RESTRICT=test
 SLOT=1.2
 SRC_URI=mirror://sourceforge/jtds/jtds-1.2.5-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb8690a509a83d7d027e7caf9d3c468f
diff --git a/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1 b/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
index 539658592e2a..c686dd55b2bb 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d058c18ae1f36332b6364358aa32277
diff --git a/metadata/md5-cache/dev-java/jtreemap-1.1.0 b/metadata/md5-cache/dev-java/jtreemap-1.1.0
index b491f11921e1..0607a9852160 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4a18d5f67cc6..6a6aa90d2ee1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66403eb2662e3ad2a35ba7c0b70742fc
diff --git a/metadata/md5-cache/dev-java/jump-0.5 b/metadata/md5-cache/dev-java/jump-0.5
index bfc01d86aaee..5468a7cf8bb8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5dd4a6b737a38e43263cb2488a61027
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index bb58c93aad61..5383cdbdb1df 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 022f132ee9d8..b435d7693e03 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=158e6080a4326f73f56ee2ac6677aaa5
diff --git a/metadata/md5-cache/dev-java/junit-4.10 b/metadata/md5-cache/dev-java/junit-4.10
index 0283a7e34ea5..4cb035682136 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f7c73fe6769e877c5a3ce850cd09a1e
diff --git a/metadata/md5-cache/dev-java/junit-4.6 b/metadata/md5-cache/dev-java/junit-4.6
index 5ff50c9c0665..1faf6ff24e16 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ea01c15ecaad..e26cc8d809bc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59bdc48e9afe1adf7e62f3ab796c6777
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4 b/metadata/md5-cache/dev-java/junit-addons-1.4
index 5b04c80f9150..acc25499b99e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ca9e7633ed512847c17b567d7b35b99
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 3951a08ecf73..cfbe31ad9789 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=397e68f195d44364ae339f232ebb8784
diff --git a/metadata/md5-cache/dev-java/jupidator-0.3.0 b/metadata/md5-cache/dev-java/jupidator-0.3.0
index c67e7e335f2a..b6b6c40c98be 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.3.0
+++ b/metadata/md5-cache/dev-java/jupidator-0.3.0
@@ -8,5 +8,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.3.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=37155fd12c9231f27772fb622fe7cf8e
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index caa3be89ddc7..8485195f9f3e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 b4163e1e5237..32e42e898255 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=03301d7661e39c4860498a89c4734232
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index 3d36925d1f0d..dd316e254824 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=592a013777d84f970298701276308db6
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 4c179ee0e31d..f80a393c53fe 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccce0933f764777cd9a45c4a44a74f19
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.2 b/metadata/md5-cache/dev-java/jvyamlb-0.2.2
index f49c0ccf0c67..c67fe5b29e11 100644
--- a/metadata/md5-cache/dev-java/jvyamlb-0.2.2
+++ b/metadata/md5-cache/dev-java/jvyamlb-0.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/bytelist: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.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=879fec1dbf836fcb5bc873aef7a230ae
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index 853aa024d2d0..0aa52527bee8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 21ddef167d62..10d53481a791 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ff67a44b508f..a13d354d74cc 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bfa2dd58bf862ec3f3065f78cff7ade
diff --git a/metadata/md5-cache/dev-java/jython-2.5.0-r1 b/metadata/md5-cache/dev-java/jython-2.5.0-r1
index 177a0552e87d..ff54ba08073d 100644
--- a/metadata/md5-cache/dev-java/jython-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/jython-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=PSF-2
 RDEPEND=>=virtual/jre-1.5 =dev-java/jakarta-oro-2.0* >=dev-java/libreadline-java-0.8.0 dev-java/asm:3 oracle? ( dev-java/jdbc-oracle-bin:10.2 ) java-virtuals/servlet-api:2.5 !<=dev-java/freemarker-2.3.10 dev-java/constantine:0 dev-java/jline:0 dev-java/jna-posix:0 dev-java/jna:0 dev-java/antlr:0 dev-java/antlr:3 dev-java/stringtemplate:0 dev-java/xerces:2 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz mirror://gentoo/jython-2.5.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d283ffead75ac556c265dc20f9b2b840
diff --git a/metadata/md5-cache/dev-java/jython-2.5.1 b/metadata/md5-cache/dev-java/jython-2.5.1
index 7ae3756cef91..c152cbc87260 100644
--- a/metadata/md5-cache/dev-java/jython-2.5.1
+++ b/metadata/md5-cache/dev-java/jython-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 =dev-java/jakarta-oro-2.0* >=dev-java/libreadline-java
 RESTRICT=test
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz mirror://gentoo/jython-2.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6efc68f987cf06418d39377637ba363
diff --git a/metadata/md5-cache/dev-java/jython-2.5.1-r1 b/metadata/md5-cache/dev-java/jython-2.5.1-r1
index b4e4cc437ac4..1b6b8182903e 100644
--- a/metadata/md5-cache/dev-java/jython-2.5.1-r1
+++ b/metadata/md5-cache/dev-java/jython-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 =dev-java/jakarta-oro-2.0* >=dev-java/libreadline-java
 RESTRICT=test
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz mirror://gentoo/jython-2.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21dfb1955c1fb6a374d775479c3fc2a9
diff --git a/metadata/md5-cache/dev-java/jython-2.5.1-r2 b/metadata/md5-cache/dev-java/jython-2.5.1-r2
index 18acb954c858..b3860b211e9b 100644
--- a/metadata/md5-cache/dev-java/jython-2.5.1-r2
+++ b/metadata/md5-cache/dev-java/jython-2.5.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 =dev-java/jakarta-oro-2.0* >=dev-java/libreadline-java
 RESTRICT=test
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz mirror://gentoo/jython-2.5.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=624049612e40d96679741a5b548b4ee0
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 c51447196172..2322951a0e9e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=420e91bb13521aa090fff44a42e2f799
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.1 b/metadata/md5-cache/dev-java/jzlib-1.1.1
index d0d761955a6c..2b4a22e8fc51 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7154aaa0fb9d3bf55ea2f2aef34e01a8
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 132c99bd1acc..fdd4209da87b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=445a6dd2cfdf1c55c9cd90ba5e8ee04c
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r1 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r1
index 5a55d1775be1..b17a44691650 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r1
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar dev-java/jcalendar:1.2 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edab62a6cfede67ba826bbab67b8d342
diff --git a/metadata/md5-cache/dev-java/laf-plugin-0.2 b/metadata/md5-cache/dev-java/laf-plugin-0.2
index ace16b1b0795..49fb0fac1cc8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8149e514881cee2057f86bd4c8eb5b58
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r2 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r2
index 8dd45fef38c4..b149a7638b2b 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r2
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r2
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jss =dev-java/jakarta-oro-2.0* >=dev-java/java-config-2.1.9-r1
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21fff856eaf9f2fc518e020f7fc5af80
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r3 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r3
index 6f5c957d462f..133d1aa7e184 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r3
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r3
@@ -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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98a3a91583259e15c9ce3e130ee79aa5
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.1 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.1
index d422c33664be..af4fdbf9845e 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.1
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.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=http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0c5d61cdda1520e7b672be2ce68efa2
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2
index 77ed27791764..71b3a53fa0ef 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2e9122126b461f1fcd2fc0f34345c1a7
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 b7c2a72b3dd0..d89e36715924 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=257207896a88489992fa40bc4259a464
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index 942c57613324..6622ebd610e9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f68800126adb9aa34b27cf905d2297b3
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r2 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r2
index a55babaef5d5..f23a79d3f1f4 100644
--- a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r2
+++ b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r2
@@ -9,5 +9,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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f3be6e8adcbc1029211a69fe8da7cd9
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 89eec5f5fe68..6e475d8c92a1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7cabea8588cdf0c10c84a6cb70b5e523
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.15-r2 b/metadata/md5-cache/dev-java/log4j-1.2.15-r2
index c01a6e6d6e85..7cb210cbbca1 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.15-r2
+++ b/metadata/md5-cache/dev-java/log4j-1.2.15-r2
@@ -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.15/apache-log4j-1.2.15.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3926b407cb6d6096343121ef4326b1c7
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.16 b/metadata/md5-cache/dev-java/log4j-1.2.16
index f5486eedd331..7ca577f8c967 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f8592b16e9543ddb140bcdfbe789333
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 ad800c4d75fb..c65244883c3e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2e5b93299ced8bc49ee7797d7ccf6656
diff --git a/metadata/md5-cache/dev-java/lucene-1.9.1 b/metadata/md5-cache/dev-java/lucene-1.9.1
index 16b84d53ce9a..b61ce6665c24 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=613956b9aaeec752eda97ab4b91b3f9a
diff --git a/metadata/md5-cache/dev-java/lucene-2.1.0 b/metadata/md5-cache/dev-java/lucene-2.1.0
index 928745a88b82..73cffc8f024e 100644
--- a/metadata/md5-cache/dev-java/lucene-2.1.0
+++ b/metadata/md5-cache/dev-java/lucene-2.1.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
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.1.0-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa77d3d30a03a7d0758d434ecb43432d
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 2a1561b25803..9c84dc808816 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=790780116cd035e9789d971bc3398dd7
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 438074067d23..3266062fa34c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bcc79387ac09150df038baf9c4656033
diff --git a/metadata/md5-cache/dev-java/lucene-2.2.0 b/metadata/md5-cache/dev-java/lucene-2.2.0
index 8a85944c4b2c..c35fbfcd7ea3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fff3d6ec3580aa8565abbc9c07714654
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.0 b/metadata/md5-cache/dev-java/lucene-2.3.0
index 19f9ea2ad1f6..5e6baa6052ff 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/lucene-2.3.0-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82a0f58f4693ca6b86ee2719371eee8c
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.1 b/metadata/md5-cache/dev-java/lucene-2.3.1
index e8c438748b6b..d641f9f16467 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/lucene-2.3.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d24fda521e618423513f2280e5465218
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.2 b/metadata/md5-cache/dev-java/lucene-2.3.2
index 73ea2e4457ec..4d45a0d12efd 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/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=70472ebefa95e1d747279a31494f859f
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 47d4ee8fa2e1..d05a1d32a15d 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/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5d2d33abe685a16b997717e117161104
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.0 b/metadata/md5-cache/dev-java/lucene-2.4.0
index 93cc2f9a998d..2c2e7419142d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31d90d7108df380f8180bdf9a015f096
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1 b/metadata/md5-cache/dev-java/lucene-2.4.1
index 5c9d5ce95f18..8cbe8f203427 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea5a7b5fbc73050a3d9edb3ea8125fe9
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 66d154bc09bf..12fa1e652040 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a53c172b172cf90840f82c7bf9c4a78f
diff --git a/metadata/md5-cache/dev-java/lucene-2.9.4 b/metadata/md5-cache/dev-java/lucene-2.9.4
index e81b78bfb4bf..624a20de47cf 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
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8ffb0df0bf3dbbc0a49431f32960ec2
diff --git a/metadata/md5-cache/dev-java/lucene-3.0.0 b/metadata/md5-cache/dev-java/lucene-3.0.0
index c450b47573bc..4363c75118c0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43fcb76a7890abe037c29b995ebcfde2
diff --git a/metadata/md5-cache/dev-java/lucene-3.0.3 b/metadata/md5-cache/dev-java/lucene-3.0.3
index 3914d112da02..68c13229b341 100644
--- a/metadata/md5-cache/dev-java/lucene-3.0.3
+++ b/metadata/md5-cache/dev-java/lucene-3.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, full-featured text search engine written entirely
 EAPI=3
 HOMEPAGE=http://lucene.apache.org
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ppc x86 ~amd64-fbsd ~x86-fbsd
 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
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=967c4670b4521a531a262d66c2b65b23
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=19c6c101b9fad2ed744960cd01344e6b
diff --git a/metadata/md5-cache/dev-java/lucene-3.4.0 b/metadata/md5-cache/dev-java/lucene-3.4.0
index 7259cc1a35f9..bd257d4621b1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b18505bdb0c32b46c72f8fb06b9b436d
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
index 7e8e1f8264bf..fcbc89363f1f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=420fc6ab1f8dc321ed29dfcfe179c312
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 921aaf4c3f07..7ff75d3377b8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 3f561c763bfb..add8ff22cc01 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c059f35908a9079f7a91dd965fc59b9
diff --git a/metadata/md5-cache/dev-java/lzma-4.63 b/metadata/md5-cache/dev-java/lzma-4.63
index 2c46977f46c2..1576cfe4d52b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6695b44a056070019f2b51569f6fd740
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.94 b/metadata/md5-cache/dev-java/lzmajio-0.94
index 965bd72ef33e..0f3e8f1c364f 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.94
+++ b/metadata/md5-cache/dev-java/lzmajio-0.94
@@ -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.94.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3f64d4faafd1954d844415ebb347e067
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95 b/metadata/md5-cache/dev-java/lzmajio-0.95
index 3a371d696c55..93467c652f6c 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95
@@ -4,10 +4,10 @@ DESCRIPTION=Implementations of LzmaInputStream/LzmaOutputStream interacting with
 EAPI=2
 HOMEPAGE=http://contrapunctus.net/league/haques/lzmajio/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cd9370b4837afc40e146265716b402a2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_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 f1f34814f92b..f649645e3699 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd46da9671dfd45bbbb59560f0fa5aa7
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.10 b/metadata/md5-cache/dev-java/maven-bin-2.0.10
index 463d04481925..3648e7bc5957 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.10
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=2.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.0.10-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5813d9f50cdc25ffb18ce30b19752a3f
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 8d0a624fd04f..2eb8539e7bb4 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-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d9ad609bb89d0b1de3b5df0f15b318ad
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1
index cc4e86e48ad2..24d327bcdab2 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e213798c2129f47aab6cebd63f5fa2da
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.1.0 b/metadata/md5-cache/dev-java/maven-bin-2.1.0
index fb09c1892ad6..eecdc082c1f3 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.1.0
+++ b/metadata/md5-cache/dev-java/maven-bin-2.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.1
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6916b7e06121d4fa176e38f224096ee5
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1 b/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1
index fbf570e144f4..f79e417c63c7 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.1
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce518eec32f169155966ad805bb6a1c7
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 515ee37c4af1..6073b4a09587 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-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.2
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=952e3f7ddb7ae8d9b6c16dc55dbac8e4
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1
index f69bac2792b2..f82b1c48660e 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=2.2
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b41aa0394826aad5097edd520ef9dcee
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0 b/metadata/md5-cache/dev-java/maven-bin-3.0
index b054cade5f81..2b4a3276e562 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fda3c6d157b78e6af189362b13f2e07b
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.2 b/metadata/md5-cache/dev-java/maven-bin-3.0.2
index 214b5f326b8f..e99e0c7479cf 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.2
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.2-bin.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=86b978de5f4af01a9c031538ac75f3ad
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.3 b/metadata/md5-cache/dev-java/maven-bin-3.0.3
index 4d79cb6b0cd8..9eb4542524f6 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.3
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79ac1e4e5631bc3b6fb12fe217875d0e
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1
index a5c8ef361821..e764528f0006 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=20a7777c2f08ea36f2ff69fc61afb0b3
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4 b/metadata/md5-cache/dev-java/maven-bin-3.0.4
index 7ed0b4a8feee..2144258a4dd2 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54529644c091a6e7a27985e11be21300
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 67b2440d8c3c..503c7f0444f0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f0bf178cd854985152ab40a3ef02b81
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
index c207101716ed..706272da43d8 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3dc4ba1963809c0cf7b2b414ea3cdd03
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 eafc417a6f24..b6952b5af60d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1ec610ce12cd43f17671805bf42ab996
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r3 b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r3
index c0af2f2805ab..589326b818a5 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r3
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=http://www.drewnoakes.com/code/exif/metadata-extractor-2.2.2-src.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91060c1eeea24fa50f77e0797c6312df
diff --git a/metadata/md5-cache/dev-java/mg4j-0.9.1-r1 b/metadata/md5-cache/dev-java/mg4j-0.9.1-r1
index 644e198c5df0..deb457d3020e 100644
--- a/metadata/md5-cache/dev-java/mg4j-0.9.1-r1
+++ b/metadata/md5-cache/dev-java/mg4j-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/fastutil-4.3* >=dev-java/jal-20031117 dev-java/colt =dev-java/java-getopt-1.0* =dev-java/libreadline-java-0.8* >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dedc64b99ded84eb43e55ffd67fec9db
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4 b/metadata/md5-cache/dev-java/microba-0.4.4
index 6a59fbc0f449..ed4ca61f40a8 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=973273ae9c06db9ae98e95e4c7af531f
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index ab3f090752c4..a4aff2ec1de0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5db9a24a5c95e4866902fd211442af37
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index bd57b13c511b..ede1356f723d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d30b484065b560d740df18c36043d521
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 4bd1861bdbe8..da4d8d858891 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8876ef1c7628201b304701e32b80cde6
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 17cffb37060b..59fd4375f775 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b9cf7609291e3ff65a88be540329c2e
diff --git a/metadata/md5-cache/dev-java/mockobjects-0.09-r4 b/metadata/md5-cache/dev-java/mockobjects-0.09-r4
index 68b9cd2d3e47..9256bd8aebc2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 b191a08a4f02..4852c36e7c46 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b69b83efd7b77e3702ee9d4d4f2774f2
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r1 b/metadata/md5-cache/dev-java/msv-20050627-r1
index 2258d616051d..decbce71901d 100644
--- a/metadata/md5-cache/dev-java/msv-20050627-r1
+++ b/metadata/md5-cache/dev-java/msv-20050627-r1
@@ -8,5 +8,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/iso-relax dev-java/relaxng-datatype dev-java/xml-commons-resolver >=dev-java/xerces-2.7 dev-java/xsdlib >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/msv.20050627.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c646da4df2d9dc696888f360013a677
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r2 b/metadata/md5-cache/dev-java/msv-20050627-r2
index 506d9f36a627..36a5c7e87d57 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=84fe23ce6fb62a2980cce2bb97e2fb8d
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r3 b/metadata/md5-cache/dev-java/msv-20050627-r3
index 6a40f6b0ff4b..77af242e7262 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5510a4afbb6e..512a301b1877 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 510e4f6e0417..e5f9ebe1e6f6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 8fc88c69c80d..ccf05734f161 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=mx4j
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=beee11ed4c14c1067e81085e7232b45f
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 5e39ea7dac48..5d42fffc8ea9 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=mx4j
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f25cd9b660675af57717866941ce1c33
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 bd693d2c5bd4..0056bd271b87 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=mx4j
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=96550c67c18e4e400d44644cec355433
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 2ef8d62e3b7e..b830a27df0f7 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=mx4j
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5f147ee949a173c932417b9b8778951
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23 b/metadata/md5-cache/dev-java/nachocalendar-0.23
index 4502e58896f8..1092cf2a4347 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=974b656ac868a7e3c35f257504f49262
diff --git a/metadata/md5-cache/dev-java/nailgun-0.7.1 b/metadata/md5-cache/dev-java/nailgun-0.7.1
index fea1919651ce..5523c2cd438e 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=64c55fbc7529edfdad642dc25d6472fa
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 8162355a9cfa..98dae5eb3fc9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52234592a8ee44a8e5903dd2d71390da
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 deadc94932e0..55503fbb4d9a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d886a55a1bcacddbf17e80aec1002cc0
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.6 b/metadata/md5-cache/dev-java/nekohtml-1.9.6
index 808031125cb3..d550c3e7ee55 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=644d0f92e9890a414a703fe5b0addc00
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.0.1 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.0.1
index f1f66a7643dc..d4ad452a3dc9 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b03ca870f9b172d175be8d8fcafe93bc
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.1 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.1
index aabc8216b67b..51e531f40a9a 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc87542e34dec95c9540723f04445991
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
index 628ab73d2d96..a08949950616 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58f66f949872865d7b95090cff1ecb16
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.0.1 b/metadata/md5-cache/dev-java/netbeans-cnd-7.0.1
index e46af2471526..d108acc2cba1 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2eb5349c8ff84bce40d46b98b2e4b48
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.1 b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.1
index 5fa35ffceb10..51bebc8f641e 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.1.1 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58a74d275af13688b7b48083897c8c82
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2 b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
index 30e996b0a839..899a3e99f155 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d0815b04fbb83b89fb8aa0141e11b92
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.0.1 b/metadata/md5-cache/dev-java/netbeans-dlight-7.0.1
index 0c6a8d8247ee..af12cf7bc3a8 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar http://hg.netbeans.org/binaries/F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip http://hg.netbeans.org/binaries/623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2b5d802f15ee4d66ce2b274850f5317
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.1 b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.1
index 66c652746c29..d71ee051664f 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5a5a9d4835d01fd5999572f221019ef
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2 b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
index a446587d761c..4cf10bb1537d 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a12f36d83dede0793b82e641a2ceb38f
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.0.1 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.0.1
index cf27b1c84692..5d5f868a9272 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-profiler-7.0.1 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/commons-fileupload: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-logging:0 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.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.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/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/BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip 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/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar http://hg.netbeans.org/binaries/F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar http://hg.netbeans.org/binaries/123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-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/BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar http://hg.netbeans.org/binaries/4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip http://hg.netbeans.org/binaries/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eeea145a5f368a50d20f2a3f2417017f
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.1 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.1
index dbe97618bb41..0fc922db43a8 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-profiler-7.1.1 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-websvccommon-7.1.1 dev-java/commons-fileupload: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-logging:0 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.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/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/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c79d210e8c3be6af683cc259863177e9
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
index f91a64e1d6bd..15040786dad2 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload: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-logging:0 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.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/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/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e28bc5a81447729ff2c23136f3f2c9f8
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.0.1 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.0.1
index 5668e48dde8f..b43e835c2744 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-nb-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b8767479ad82e186321d31e8d0b0159a
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.1 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.1
index bf14ed737f66..c5eb1f36594a 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-nb-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45f2cc2081745b1b7fdb636554f7a1a5
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
index 87466830b4b5..bf5db2ed7301 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5061572cc252d0de7df8b22945332bd8
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.0.1 b/metadata/md5-cache/dev-java/netbeans-groovy-7.0.1
index af6cb9fe2478..424bd34885b6 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b368a7dd314b4e574cce0585001d5a05
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.1 b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.1
index 7726d06502bc..39350de47f8f 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0944d85bc2a180eb9ca967f3ab33ec7f
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2 b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
index 71c10f32c84b..52a490a99b1d 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=32f07eb8f44548498150558112b32cb1
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.0.1 b/metadata/md5-cache/dev-java/netbeans-harness-7.0.1
index 3c4a03a406c3..3b3db3ceec41 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47ffaa96ca6ebb97a49bb6233e7d00c0
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.1.1 b/metadata/md5-cache/dev-java/netbeans-harness-7.1.1
index 57fc6c215bb6..18dbdb720370 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.1 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e4831576cd135cceb9e1c40cf352b0a
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.1.2 b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
index 0b4c3beb7b72..8017caf83fe9 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e53d0fae63665f2f3bd6cafa0025bded
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.0.1 b/metadata/md5-cache/dev-java/netbeans-ide-7.0.1
index 2e62433a9bc3..43372a0284f0 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-platform-7.0.1 dev-java/antlr:3 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/flute:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jakarta-oro:2.0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsch:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/jzlib:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/sac:0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/xerces:2 dev-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-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/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.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/94408B54D039DA036A668C6B331EF944AF2E90EC-org.eclipse.mylyn.bugzilla.core_3.3.1.jar http://hg.netbeans.org/binaries/7D3CCD3ED4DB57F2B746F5ABAF86D10F222AEB87-org.eclipse.mylyn.commons.core_3.3.1.jar http://hg.netbeans.org/binaries/02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar http://hg.netbeans.org/binaries/DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.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/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1733ea0870eb2ae999215f53ae260731
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.1.1 b/metadata/md5-cache/dev-java/netbeans-ide-7.1.1
index 3283b3b9fc75..e78737843d55 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-platform-7.1.1 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/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.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/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-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/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/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a27fb0364a10c4ab20a96ad85f20bd0c
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
index 094c4f60ce92..cae67f3a750c 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.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/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.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/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-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/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/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=472ca6db245b1f57f4874c8c4a7c0cf2
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r1 b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r1
index c67abb692db6..732ff1fe7f75 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r1
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker: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/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 >=dev-java/maven-bin-3.0.3:3.0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4562ddc38d43a8689d4ef43445b516c
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2 b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2
index 1cabc39889e3..7c35c7141133 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker: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/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 >=dev-java/maven-bin-3.0.3:3.0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e8cae008b2c154cefe15358c1ce48fcd
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.1-r1 b/metadata/md5-cache/dev-java/netbeans-java-7.1.1-r1
index 0f731e6f5ed8..00b0f4d66e23 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.1.1-r1
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-websvccommon-7.1.1 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/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/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.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/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.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/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-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/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=72054b8b2a04769e02320bd14aa0756c
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.2 b/metadata/md5-cache/dev-java/netbeans-java-7.1.2
index bcdfbb0ff6ff..75c133ac5bdf 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.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/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/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.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/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-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/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e31d921f21eda6293337e558092059a
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1 b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
index 1e6c99035758..bc9165e8ea39 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.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/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/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.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/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-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/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=880bd93f7c77aa7e06338738d58b4304
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.0.1 b/metadata/md5-cache/dev-java/netbeans-javacard-7.0.1
index 321647b5183b..bc87491c4785 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-platform-7.0.1 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.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5280583b7445ee46f551bd8c363e475b
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.1 b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.1
index c08f8a419d37..fcda90875949 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71e694c759a4a3ce29ff90df6fe8e238
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
index b8532fa73ef9..2ebe185b7ae9 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e751b7f51cfc3416ee5f480085161cb7
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.0.1 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.0.1
index a10ccb453530..6a9fef30ca21 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a55854a047bdb879896b457e68f6189a
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.1 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.1
index 1a7c76b1b41a..feae27a72f76 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4011470e68e92d043f2d6306723d8dbe
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
index b715661b16fe..c510981fdbdf 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5fd6494a468247a030ec121a14214ceb
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.1 b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.1
index d0b19f1d9767..86c1915302ca 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9fc0b79ea1d16db0360a9898e87bb6db
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
index ad4fd44ef932..c07e9f6d9689 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d04c506b54f03c52cf1a1df732ba075
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.0.1 b/metadata/md5-cache/dev-java/netbeans-mobility-7.0.1
index 314e166f5c8f..3733c9e4c58d 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.0.1 ~dev-java/netbeans-enterprise-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/ant-contrib:0 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.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/3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar http://hg.netbeans.org/binaries/2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar http://hg.netbeans.org/binaries/793B8D020D81284E0B67FB635C17026121F06433-RicohAntTasks-2.0.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=776b3ddca3c95c967310cc3efc2cfb68
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.1 b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.1
index b4f4097d9da1..4b289fe546c7 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.1.1 ~dev-java/netbeans-enterprise-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-websvccommon-7.1.1 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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bf77fc370296fbdc55dd0ad4343f1850
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2 b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
index 61b064230048..befe26e760a0 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.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.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=880d785447cdbc2f4c47546063a8ca1e
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.0.1 b/metadata/md5-cache/dev-java/netbeans-nb-7.0.1
index 52291ede1d2f..70d505e3be3f 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5be217d8dddf2e27881649f51f2b2097
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.1.1 b/metadata/md5-cache/dev-java/netbeans-nb-7.1.1
index 44b4f86653b0..ac7a85c785e7 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff6756c8e06b06a8888edfa959092abf
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.1.2 b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
index 27cbecfa4779..b1789e0cea75 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ca0e6c7f52272f77cbfc985d56111dda
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.0.1 b/metadata/md5-cache/dev-java/netbeans-php-7.0.1
index a556d1dc75c8..5e85dbcabfa7 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip http://hg.netbeans.org/binaries/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9562efd5c7f9286765588648373f059d
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.1.1 b/metadata/md5-cache/dev-java/netbeans-php-7.1.1
index 8479389f4f87..cdf038660024 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-websvccommon-7.1.1 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f99ef8ddd1c90fb95a7f568a762c95b
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.1.2 b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
index 1457a64519ab..6177dcb8547e 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b131a0f4a2ffa4e161784b48fb72207
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.0.1 b/metadata/md5-cache/dev-java/netbeans-platform-7.0.1
index 6b641c8d611e..a24567f7f39f 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar http://hg.netbeans.org/binaries/BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9467d39593d6708fa022e5ce7f60b57
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.1.1 b/metadata/md5-cache/dev-java/netbeans-platform-7.1.1
index 441fb92ef563..7e5cae3675fb 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aeb250d27d14e561a33b2e889fd90496
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.1.2 b/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
index 46209392db3d..99c73b58ab66 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.1.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.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85d478245fd0b8f487c34ff54cf2fefc
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.0.1 b/metadata/md5-cache/dev-java/netbeans-profiler-7.0.1
index 55dba655b61f..8f513d53c7b8 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-java-7.0.1 ~dev-java/netbeans-platform-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=76e314af7ae0fb77809f1c826973f4a4
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.1 b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.1
index 80d30ef96d1e..2ba7462374c3 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-java-7.1.1 ~dev-java/netbeans-platform-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f3bfc9a162537bdd0a4efe1da3468d5
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2 b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
index 9222b97ce2d4..c55c2e58e4ac 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57d02c17798c4a819c6d9ff631fb94a3
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.0.1 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.0.1
index c213ab5b3f1e..1973741d9ff7 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.0.1
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-ide-7.0.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08229bb24cc5dfd7adec8e15ed460c09
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.1 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.1
index cc0b7b83acac..4f797fcd664e 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.1
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.1 ~dev-java/netbeans-ide-7.1.1 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bbdb0de4110320fbc54595833fd5de38
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
index 1acb680f2d7c..ddcc58022d30 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f9281766c125385f1e1956e51360166
diff --git a/metadata/md5-cache/dev-java/neuroph-2.2 b/metadata/md5-cache/dev-java/neuroph-2.2
index c4c35774b949..54e9c031478b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d485ec64345e937222b39ded1cf1521c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index 717ad184e884..0ca4f79f007a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 53e998ed20ec..5ff226ac96df 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a4d6d4f58d9fb807148800786cf71e97
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6 b/metadata/md5-cache/dev-java/odfdom-0.8.6
index 5e794228820e..c3df478bd178 100644
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6
+++ b/metadata/md5-cache/dev-java/odfdom-0.8.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.3 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c97ce48697de846ff2f10a05de008655
diff --git a/metadata/md5-cache/dev-java/ognl-2.6.9-r1 b/metadata/md5-cache/dev-java/ognl-2.6.9-r1
index bf2ec15424d7..c0447779b8a4 100644
--- a/metadata/md5-cache/dev-java/ognl-2.6.9-r1
+++ b/metadata/md5-cache/dev-java/ognl-2.6.9-r1
@@ -8,5 +8,5 @@ LICENSE=OpenSymphony-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/javacc >=dev-java/javassist-3.1 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd57efc3980b278ab5b5b92895b2a720
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 32b365383e0d..0fef2c3efe43 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6ebc5b8b42347ad46a58ba5dfb5e5ee
diff --git a/metadata/md5-cache/dev-java/openspml-0.5 b/metadata/md5-cache/dev-java/openspml-0.5
index 3371dfe0b76a..52e6643672ad 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8042564206fc5eb7e94fc01edfb1309d
diff --git a/metadata/md5-cache/dev-java/openspml2-1.0_rc2 b/metadata/md5-cache/dev-java/openspml2-1.0_rc2
index e7782d867304..2356bebc9da0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a71a8df0a2dad9f63e6add4592cbfca9
diff --git a/metadata/md5-cache/dev-java/oscache-2.0.2-r2 b/metadata/md5-cache/dev-java/oscache-2.0.2-r2
index 2950344c1c39..f69938197230 100644
--- a/metadata/md5-cache/dev-java/oscache-2.0.2-r2
+++ b/metadata/md5-cache/dev-java/oscache-2.0.2-r2
@@ -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 dev-java/sun-jms dev-java/jgroups >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=https://oscache.dev.java.net/files/documents/629/2653/oscache-2.0.2-full.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6348ffb97e1632167719ebb51d828e4
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 7ec3d2ee7b4e..3f94fbecc897 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=648e8fa3beb47c963d16d4a68a75ae46
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 41e5075af775..e0a329c37329 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
 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.jar -> osgi-core-api-4.3-all.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf3ef3d4d370601bb521ccdda6aa525a
diff --git a/metadata/md5-cache/dev-java/pat-1.5.3 b/metadata/md5-cache/dev-java/pat-1.5.3
index 41fb4282d66e..dc587d5f77f7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6c70f6068729bdedff09724cc120a29
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 83f219179fa5..155b993b91a3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e65a9212dc699ccdfe089f1e6d909710
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-0_pre20090523 b/metadata/md5-cache/dev-java/pdf-renderer-0_pre20090523
index 5fb40d4960f0..47bce37d9985 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-0_pre20090523
+++ b/metadata/md5-cache/dev-java/pdf-renderer-0_pre20090523
@@ -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=mirror://gentoo/pdf-renderer-0.20090523.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a697e68e5e98d59d341ac581bcd59d8
diff --git a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r2 b/metadata/md5-cache/dev-java/pdfbox-0.7.3-r2
index bb7fa7665b0d..d82cd57f275c 100644
--- a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r2
+++ b/metadata/md5-cache/dev-java/pdfbox-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/fontbox >=dev-java/bcprov-1.32:0 >=dev-java/b
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pdfbox/PDFBox-0.7.3.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fe1c2c6199177e730f5de71cec505ec
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 36e67cdbd026..52f5e9140fd2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a0592fcf7c79..9a9760695542 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2ee77988b4bba9a563657bbfd43189b9
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 6ca8904ae141..bd395a433ce5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=00f12e7be5014ba895abad2cb19d5acb
diff --git a/metadata/md5-cache/dev-java/poi-3.2 b/metadata/md5-cache/dev-java/poi-3.2
index a990104f5ca4..87d5b6af6a09 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d81895130c8522916bd6f1ca52d27be2
diff --git a/metadata/md5-cache/dev-java/portletapi-1.0 b/metadata/md5-cache/dev-java/portletapi-1.0
index d375c7c31cfd..bded50cf17e3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6f9696fae4be34ec7c7725af2a396f3
diff --git a/metadata/md5-cache/dev-java/prefuse-20060715_beta b/metadata/md5-cache/dev-java/prefuse-20060715_beta
index 8f09c67984a4..76513b155b09 100644
--- a/metadata/md5-cache/dev-java/prefuse-20060715_beta
+++ b/metadata/md5-cache/dev-java/prefuse-20060715_beta
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20060715.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a77dcd19f114b833660ca0549ab5f73e
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index f0acc0e5fcec..adfe34125bbb 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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5957df115f5be783a8c686ed8d4923a5
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index 6e559101aa53..3cbd1c2ac96d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f42cb0653f8acaa772c61a6e96885e2f
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index 4eb249bdf649..832ae3393b08 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74ab72453931f290aa90184b8407df63
diff --git a/metadata/md5-cache/dev-java/proxool-0.8.3-r1 b/metadata/md5-cache/dev-java/proxool-0.8.3-r1
index ec30c7b1bb2e..fc9c960ee567 100644
--- a/metadata/md5-cache/dev-java/proxool-0.8.3-r1
+++ b/metadata/md5-cache/dev-java/proxool-0.8.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/log4j =dev-java/servletapi-2.4* =dev-java/ava
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/proxool/proxool-0.8.3-source.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73c915ff115a4305bbf5bd9bc570a575
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 6a50151e64a8..696c65817977 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=71d2ca4142a8b4e014e3c59449d20593
diff --git a/metadata/md5-cache/dev-java/qdox-1.12 b/metadata/md5-cache/dev-java/qdox-1.12
index 0c4568c0c844..f5ae6f3abcd3 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12
+++ b/metadata/md5-cache/dev-java/qdox-1.12
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core dev-java/junit >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0709816697fd43ea4e0df9e7f47de35f
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index a12e3fc1065a..260da30b7ab2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53719a54fa704d2fac68dde15e5d33bd
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 4ff18e3af1ff..3d2ed0908c70 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35d8cb3156c3c972015335d353c3e2b2
diff --git a/metadata/md5-cache/dev-java/randomguid-1.2.1-r1 b/metadata/md5-cache/dev-java/randomguid-1.2.1-r1
index 8d1be4cfbe60..7751c7014d0f 100644
--- a/metadata/md5-cache/dev-java/randomguid-1.2.1-r1
+++ b/metadata/md5-cache/dev-java/randomguid-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=ftp://www.javaexchange.com/javaexchange/RandomGUID.tar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9233fae76b24656e8845b827f8bd9c4
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 bec092bd0afd..786671fa81ed 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a8646931d1e13fafafc06bff92fb3c54
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12 b/metadata/md5-cache/dev-java/relaxngcc-1.12
index eba84ee42c4f..4bdfbacb6d7b 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/relaxng-datatype dev-java/msv dev-java/ant-core dev-java/xsdlib >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d969b5f6a4b3e47b4555ad1944be91eb
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r1 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r1
index 45f29dfb355c..9b68009c17d2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f7b1ba3240a99347454c62d193f4fad
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 0a3bea4a8f92..9b6c2cf477f7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 12ca4be38446..f03631db804f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a4e92c0dd847..2a708b6cb5d1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 8d009e4a5912..017866a12ba9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce53a1f22d45a9165fc8aeaba655036f
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 c8f2a93832a5..56d4346c8082 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f68e8e9dd73e..f4844604ea28 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 861844486ca4..47f15c879ebb 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 3873f687041c..79496e557c00 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 7d6d459835ab..60cffdcd8e32 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 eb5026b1c5c9..b785a4b5432e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f6bcdab4c07c21d2bf5955c3b821fe76
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 fe902dcc873b..bbe23f7eb187 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c02a007a4a0eb4fe62ca6889d6eacd93
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 af2a012df2e1..209cf4da38b1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5476e4ba025048f87fcdda57c3eb2b70
diff --git a/metadata/md5-cache/dev-java/rhino-1.6.5 b/metadata/md5-cache/dev-java/rhino-1.6.5
index b218b41d0527..89597a58f0e6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=743be96e02d803554d5e0c73d461f69c
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.2 b/metadata/md5-cache/dev-java/rhino-1.7.2
index dcf9e4d430b6..83e8ed97ae84 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.2
+++ b/metadata/md5-cache/dev-java/rhino-1.7.2
@@ -8,5 +8,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 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d77f93b201af397fc85a783721e6dda3
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.2-r1 b/metadata/md5-cache/dev-java/rhino-1.7.2-r1
index 87495b3b75c5..0a3e2f0b375c 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.2-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 ) BSD-2
 RDEPEND=>=virtual/jre-1.5 =dev-java/xml-xmlbeans-1* dev-java/jsr173:0 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c05970976d82485e83149c4e2f52a768
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 31bd183762d7..87a802a385e0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=303040c6511822c2f984cf105f203f99
diff --git a/metadata/md5-cache/dev-java/rngom-20051226 b/metadata/md5-cache/dev-java/rngom-20051226
index 014a6fef576b..d9f8a64689d3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94fbd98e537d2dad5611fe3306343d76
diff --git a/metadata/md5-cache/dev-java/rome-0.9 b/metadata/md5-cache/dev-java/rome-0.9
index befe265b56a3..c44e1717031f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2050db2c0977b6ebd489457827392eb
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11 b/metadata/md5-cache/dev-java/rundoc-0.11
index 267382895844..258179600f7d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d87cb5157fbd81786b4fc8e5d77a8744
diff --git a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2 b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
index 7e14b752f292..ddf119b991c6 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r2
@@ -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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a79166011aa7a1afe843740675e790c
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 15f7db29a044..b47fcdf6a764 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ecc2ef16c4c6..31dedf5da3fb 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=824ec5d8572a8204ee081f92ebd51818
diff --git a/metadata/md5-cache/dev-java/saaj-1.3 b/metadata/md5-cache/dev-java/saaj-1.3
index ed253d584e42..ba603d8ccc12 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3
+++ b/metadata/md5-cache/dev-java/saaj-1.3
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr67 dev-java/sun-jaf >=dev-java/xerces-2.8 dev-java/xalan >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://saaj.dev.java.net/files/documents/52/32731/saaj1.3.src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=536cbca0c8741aad35b5558b2d0b1ede
diff --git a/metadata/md5-cache/dev-java/saaj-1.3-r1 b/metadata/md5-cache/dev-java/saaj-1.3-r1
index dc4da468c478..cbd44f0dd2c5 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3-r1
+++ b/metadata/md5-cache/dev-java/saaj-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/saaj-api java-virtuals/jaf >=dev-java/xerces-2.8 dev-java/xalan >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://saaj.dev.java.net/files/documents/52/32731/saaj1.3.src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d238316a211bd3da24d0a25f1e95a726
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19 b/metadata/md5-cache/dev-java/saaj-1.3.19
index e000b59e88c0..b9271a9280fe 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9bf405f70f57737d31e51921ac365713
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 7d52a7a687ba..7eee5cd74bfe 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SOAP with Attachments API for Java
 EAPI=4
 HOMEPAGE=https://saaj.dev.java.net/
 IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=01b1dd198c2ab707edd0d7249d7f364b
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0fea175ff702796b73821346ea263e86
diff --git a/metadata/md5-cache/dev-java/sablecc-3.2 b/metadata/md5-cache/dev-java/sablecc-3.2
index 8c035028acff..84deffbc55a2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a9f9044f50917563882653f8bb518b86
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 d5ef7acf69d4..e3f46a5381b9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 60c942131865..c47c79d52d9a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 0505c7fc2937..41b67ac7f0af 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 e88079055bf0..2528e869769f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bceb79cd919df767f84b8ce6849be1f3
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 3c9fc5109e48..9b01d03e4e25 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 452d89770955..fb4ebc452f5e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 49454dff6c7b..94bca65c4818 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d529c32dec87ec9f366e1ab5ad980fd6
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5 b/metadata/md5-cache/dev-java/saxon-6.5.5
index 12561f605806..18b10bdcbbb9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cedc4a60b9e584d8b16f72f00222b649
diff --git a/metadata/md5-cache/dev-java/saxon-8.4b-r3 b/metadata/md5-cache/dev-java/saxon-8.4b-r3
index 047a5019eb41..e56d14058f8b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7706c672ba0a80b0aac770fabc80aff4
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 2bd263e85294..be40547cef72 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ec73fa0bd5b6531dfc3491b52c844fe
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index 87357dee1d87..8964e00eb3ba 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=saxpath
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f158079dc92579831712f0f3c298000a
diff --git a/metadata/md5-cache/dev-java/sbaz-1.25 b/metadata/md5-cache/dev-java/sbaz-1.25
index 41268df48abe..e24c3fc00474 100644
--- a/metadata/md5-cache/dev-java/sbaz-1.25
+++ b/metadata/md5-cache/dev-java/sbaz-1.25
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-lang/scala-2.7.2 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.lexspoon.org/sbaz/downloads/sbaz-1.25.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30559aa17d980d7d16485ac024bde889
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-1.3.5 b/metadata/md5-cache/dev-java/sblim-cim-client-1.3.5
index 5725705533a6..eba4b0ee9651 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-1.3.5
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-1.3.5
@@ -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=1
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client-1.3.5-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e85a302432ea1abce424e6f324ce303
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.0.5 b/metadata/md5-cache/dev-java/sblim-cim-client-2.0.5
index 52093cbed9d5..13ae616333f9 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.0.5
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.0.5
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.0.5-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52ddab52f4378849fbf2ebb83f6e64dd
diff --git a/metadata/md5-cache/dev-java/scala-bin-1.2.0.1 b/metadata/md5-cache/dev-java/scala-bin-1.2.0.1
index ffe4e0f881a3..788aab639802 100644
--- a/metadata/md5-cache/dev-java/scala-bin-1.2.0.1
+++ b/metadata/md5-cache/dev-java/scala-bin-1.2.0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://scala.epfl.ch/downloads/distrib/files/scala-1.2.0.1.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f00e801c39f2a55f9a0a65d778ccce23
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index a7dd5cc97838..98a84e541b3c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 d11c21334e61..ade977917766 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 5d98f05e6434..c96e9c91c7a1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 3db05c0d85aa..62d64a3a0d94 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4ba54a7b27c4..1019e00a6483 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2a775f4808a1832cd471db9746edd7f
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1 b/metadata/md5-cache/dev-java/sjsxp-1.0.1
index d743f1114782..1517899f2949 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bfac24e6da10ee6bf430aa9806780b31
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 604cfb4e7cae..363070b8d556 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8bb1d8e67df319f98031f0f44b764e5
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7 b/metadata/md5-cache/dev-java/skinlf-6.7
index e41c1d905075..bb9f9598e256 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7
+++ b/metadata/md5-cache/dev-java/skinlf-6.7
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a377d8070eb0714339d200bf6a5383c7
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 7376592d17bd..9e3a580e2a0d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=636f5705aa83107717ba219287fb28fd
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 895082b2c61f..41975c34d0c5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bc1e0741e28c2bf34d39ff026aa3f827
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index 7498d0d40eaa..779badfc0a46 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d74eb330272d7f56dd30f115bc5b9857
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.9 b/metadata/md5-cache/dev-java/snakeyaml-1.9
index 20371de599f4..fbe642ba835e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9856431fcf9ba7ea39b247e888e51f7b
diff --git a/metadata/md5-cache/dev-java/snip-0.11 b/metadata/md5-cache/dev-java/snip-0.11
index 7de02b2b5398..4d13da21d5d3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=80de2f670dba59dcc7c77aa2c1fd0c99
diff --git a/metadata/md5-cache/dev-java/soap-2.3.1-r1 b/metadata/md5-cache/dev-java/soap-2.3.1-r1
index c9bf42b10114..78bbc6251dd9 100644
--- a/metadata/md5-cache/dev-java/soap-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/soap-2.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-javamail dev-java/sun-jaf =dev-java/servletapi-2.4* >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/ws/soap/version-2.3.1/soap-src-2.3.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f420d4e91295446377c032fdeed80a97
diff --git a/metadata/md5-cache/dev-java/soap-2.3.1-r2 b/metadata/md5-cache/dev-java/soap-2.3.1-r2
index 1b62b275e0c6..01b2a0dad681 100644
--- a/metadata/md5-cache/dev-java/soap-2.3.1-r2
+++ b/metadata/md5-cache/dev-java/soap-2.3.1-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/javamail dev-java/sun-jaf =dev-java/servletapi-2.4* >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/soap/version-2.3.1/soap-src-2.3.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4dab252572b64c84737c90c4e2cdb11d
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 667d9a591cf0..a31c989e3655 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f515f0d2f4d6b5469bc2443d4c3e5757
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index ff61272f1b67..4fbaf2360dd1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d29b93e5042076a1981dc85f9a0aa4db
diff --git a/metadata/md5-cache/dev-java/spin-1.5 b/metadata/md5-cache/dev-java/spin-1.5
index d8c26e26d6a2..55fb397b69c6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ad801b1336a5d9521c6316c0bd6777a2
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0
index c77ed5ad2acd..25073a62a9ca 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin: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://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=21cf9764b4f8611c87a29a324b52b2ad
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index a1268ccca119..f9395e8adc32 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=485bbae973a8e2efedfbd230b23c98db
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0 b/metadata/md5-cache/dev-java/stax-ex-1.0
index 5ee0580433e0..3f18bdf716e4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 048a1c75f901..8c39b1accc87 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c68e486d85338f97df211ea406d5be0
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2 b/metadata/md5-cache/dev-java/stringtemplate-3.2
index 3ad21f141691..7aa4fa5937ff 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ac89eae67c4dd511ef7c7e87894369f9
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1
index ff0ec18de48d..3923ea7c89e6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e454b54a026bb05d29455af693827a82
diff --git a/metadata/md5-cache/dev-java/struts-1.2.9-r2 b/metadata/md5-cache/dev-java/struts-1.2.9-r2
index c79aab1546ab..910cf54195d6 100644
--- a/metadata/md5-cache/dev-java/struts-1.2.9-r2
+++ b/metadata/md5-cache/dev-java/struts-1.2.9-r2
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fe03e6d906bb6bb27807024964ae52f9
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 4cd287b8b33a..a442087d9639 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=984fb456cf71d3ea64481078816ee2fb
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index 48252b16fddc..2d33fcd05b57 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f9194d4fa9f2..545effb685e4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 62217a631aef..d2aae9bc82a5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 665717c567a2..6f0ab2a57734 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 2dad856f6555..34256d42f82c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ab6ce6bf8657..690f43bcd4fe 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3810d8cb3fb301f9023154d800c4e134
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1 b/metadata/md5-cache/dev-java/sun-jaf-1.1
index 5913077a08aa..1b5faefd1c43 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1
+++ b/metadata/md5-cache/dev-java/sun-jaf-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.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=189f31341c21cbe1c080b291f2ece976
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 bb68b84c7810..b323c225cf19 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 91d042c46923..0b5575723916 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49cb5d8f7bb8cd277f0f25ecdd0034d1
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 338852909ef2..c4c46686f382 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=34c97f14ca4368b06b0d73aa4e053aca
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 dde16d842e91..a9a750b47e0d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 8f9cdeda0fb5..05c7ab0d3c40 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c17eb6e7526913fdd2beb0e754fb2390
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.1 b/metadata/md5-cache/dev-java/sun-javamail-1.4.1
index 88ce57e35096..f9fe9a0cc4d3 100644
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.1
+++ b/metadata/md5-cache/dev-java/sun-javamail-1.4.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-jaf >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sun-javamail-1.4.1.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7dcfa5ad441a1651eec6fef6a6fd1e48
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.2 b/metadata/md5-cache/dev-java/sun-javamail-1.4.2
index 0c5e8508212e..67deadc6ba61 100644
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.2
+++ b/metadata/md5-cache/dev-java/sun-javamail-1.4.2
@@ -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.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3a0027f23123883872cd21008f703a31
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 6cfbd50a1232..737cb10a753b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d9af0e73f36b5c63cbd01da2f817c5f
diff --git a/metadata/md5-cache/dev-java/sun-jimi-1.0-r2 b/metadata/md5-cache/dev-java/sun-jimi-1.0-r2
index 9bec819d2b08..e0619ff80f76 100644
--- a/metadata/md5-cache/dev-java/sun-jimi-1.0-r2
+++ b/metadata/md5-cache/dev-java/sun-jimi-1.0-r2
@@ -9,5 +9,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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccf4d48f92c8bc6ff3edc828508f6206
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 1a190bd59005..0b5dd09793c1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c3362d2bc5aabfc4e2c97028f3e10fc
diff --git a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r2 b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r2
index d3e56cb4b77b..fcfb449dbcbf 100644
--- a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r2
+++ b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmx-1_2_1-scsl.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=869a14e4b28ece7c297346054f385eb2
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 25ecaa57895d..ed2e175d76c6 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
@@ -9,5 +9,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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3efc16649a406879a69da21817c9adc
diff --git a/metadata/md5-cache/dev-java/sux4j-1.0.1 b/metadata/md5-cache/dev-java/sux4j-1.0.1
index e06e6ea5398e..31d9eeeb79d1 100644
--- a/metadata/md5-cache/dev-java/sux4j-1.0.1
+++ b/metadata/md5-cache/dev-java/sux4j-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/fastutil-5.1.3 dev-java/commons-io:1 dev-java/colt dev-java/dsiutils dev-java/log4j dev-java/commons-collections dev-java/commons-configuration dev-java/jsap dev-java/commons-lang:2.1 =dev-java/junit-3.8* >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sux.dsi.unimi.it/sux4j-1.0.1-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=18d26f2bb0391dcad1561473a0799b0f
diff --git a/metadata/md5-cache/dev-java/sux4j-2.0 b/metadata/md5-cache/dev-java/sux4j-2.0
index 7da2130f1e9f..d88278061a0d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49df04a18a8f83bb6709fbb76c805912
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0 b/metadata/md5-cache/dev-java/svgsalamander-0.0
index 33d9d004346a..6786078a549d 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0
@@ -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 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=19a9735ef404e68fceb2bfd94b160b7d
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 a92143201dde..da71cc56275d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5a33aac5c99854d95705050126999cd
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 8bc1c3c78ce8..29723cd385ad 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e2051f2049905da5305f7c8fb6cf881
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.1-r1 b/metadata/md5-cache/dev-java/swing-layout-1.0.1-r1
index 852281676714..0378d4938f3d 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.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=1
 SRC_URI=https://swing-layout.dev.java.net/files/documents/2752/35842/swing-layout-1.0.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99315e92e41cd966e175b10d9ee7fbb2
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.3 b/metadata/md5-cache/dev-java/swing-layout-1.0.3
index 79573cce5e5a..5d655ec8dd44 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.3
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.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
 SRC_URI=https://swing-layout.dev.java.net/files/documents/2752/70793/swing-layout-1.0.3-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55f1f214a2020d9ab1724f3d5f0abc6c
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 73cac80374a9..0fd96b93ac04 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 424000ceb6e9..94ec692fb681 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33915b61891d98462124257df3290cdc
diff --git a/metadata/md5-cache/dev-java/swt-3.4-r4 b/metadata/md5-cache/dev-java/swt-3.4-r4
index 753dedd1e2ae..0a84682e8b59 100644
--- a/metadata/md5-cache/dev-java/swt-3.4-r4
+++ b/metadata/md5-cache/dev-java/swt-3.4-r4
@@ -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 >=sys-apps/portage-2.1.2.7
 SLOT=3.4
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-ppc.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86_64.zip )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8d226fe3359e1ce9d7b7bf1ca50b0dc
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
index daf3e187aef9..25fceae2d7f9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 42e68806bb90..491e6324840c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 f19c4cbe850d..4433d3d55096 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 2fd33a3ddaad..ba0c5bb28fa6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce1e11f628304a936bac75c215cc3ad4
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.1 b/metadata/md5-cache/dev-java/tagsoup-1.1
index 96d5f68f7cbd..70dfb2379448 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.1
+++ b/metadata/md5-cache/dev-java/tagsoup-1.1
@@ -8,5 +8,5 @@ LICENSE=|| ( AFL-3.0 GPL-2 )
 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.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f30415b53745c0f72d974eda04e232fe
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2 b/metadata/md5-cache/dev-java/tagsoup-1.2
index 22b0af17733f..0e99295d1ba4 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.2
+++ b/metadata/md5-cache/dev-java/tagsoup-1.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=0
 SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ae0e3ae8519809db4e09efc6f20c31d1
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4 b/metadata/md5-cache/dev-java/tapestry-3.0.4
index c3b571b04132..f6cea409e3e0 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/servletapi:2.4 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-beanutils:1.7 dev-java/bsf:2.3 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:2.6 >=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://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0dd7d30ab125069fc71d725190d1b227
diff --git a/metadata/md5-cache/dev-java/tclib-1.1 b/metadata/md5-cache/dev-java/tclib-1.1
index af652298d288..3df80e2114fc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a4ee81c5b44d776e618f085c83e9f9a4
diff --git a/metadata/md5-cache/dev-java/telnetd-2.0 b/metadata/md5-cache/dev-java/telnetd-2.0
index 0cd30cc75f3c..ac47237d4675 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b311b4ff8263bdc5c6e7f1e542464e4
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index ef24896fec45..8e00b8ceb3b3 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6aa5a47d82f1e7ca6b6ee4efff06a747
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.15 b/metadata/md5-cache/dev-java/tomcat-native-1.1.15
index 07f76bc3475b..475d44a84a64 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.15
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.15
@@ -8,5 +8,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/tomcat-native-1.1.15-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7859014db5f00e569b9f4db9417137ef
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.16 b/metadata/md5-cache/dev-java/tomcat-native-1.1.16
index 93580203eae6..3c159b582265 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.16
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.16
@@ -8,5 +8,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.16/source/tomcat-native-1.1.16-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9655f2239fb6298761f7acb2bdf97f36
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.18 b/metadata/md5-cache/dev-java/tomcat-native-1.1.18
index 62bcedc4399d..11c682dee4eb 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.18
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.18
@@ -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.18/source/tomcat-native-1.1.18-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d0f4f45fb43ee261925888b4be80b8d
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.20 b/metadata/md5-cache/dev-java/tomcat-native-1.1.20
index 2274a854f17f..d79e83abdc7f 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.20
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.20
@@ -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.20/source/tomcat-native-1.1.20-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a4812017539caba91cc35e7ed7f5eed
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.22 b/metadata/md5-cache/dev-java/tomcat-native-1.1.22
index dad17b8161d7..6f56865ea4b1 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.22
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.22
@@ -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.22/source/tomcat-native-1.1.22-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d527d3576140fd48fca387321b578969
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.23 b/metadata/md5-cache/dev-java/tomcat-native-1.1.23
index e2e666520325..85f74a8d23a0 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.23
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.23
@@ -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.23/source/tomcat-native-1.1.23-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35987750fe5284abca03d14358f7bcb6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index faa36f99eed3..e3137e131ce1 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=http://archive.apache.org/dist/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=57a669fb482c58b562bf8b07e7ac32fe
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 aa363dbe5274..87b9c35f5194 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78d2a0d919445616767620c1f1f46fef
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 5cd7762cc7d7..14ff1b3b91d6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 bf35f6ed66c6..090bd1990d5e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2af23949f96e230f08cc92a931d346c6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.35 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.35
index 9be5489cb67c..938fe84880ee 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.35
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.35
@@ -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.35/src/apache-tomcat-6.0.35-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=69eb08c8359d66a4370b16fdd89399fe
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.23
index fed12bbce1a4..c65126737f43 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.23
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.23
@@ -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.23/src/apache-tomcat-7.0.23-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43eab22c7e12c8c91de97753f34d1c84
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.26 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.26
index 9041601a1078..69088faa125e 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.26
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.26
@@ -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.26/src/apache-tomcat-7.0.26-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=301fe7cccd825839da38b059106c81f0
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.27
index ff79a88c8e9f..7c40d8473a06 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.27
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.27
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
 EAPI=2
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 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.27/src/apache-tomcat-7.0.27-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6f6c5f10474ea5a952ab0e33740615d8
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b249232c398ae83d5bef0951048847ba
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 8b7a5b9bfaea..0fdac2339434 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=35d782346437ac318c3de89f54caa3c9
diff --git a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22 b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
index c398924a9bd4..a3e44170f5cf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eeba4329a8746426daf197f448f70d6f
diff --git a/metadata/md5-cache/dev-java/trove-1.0.2-r1 b/metadata/md5-cache/dev-java/trove-1.0.2-r1
index 2b222ba31592..758b63f49aa2 100644
--- a/metadata/md5-cache/dev-java/trove-1.0.2-r1
+++ b/metadata/md5-cache/dev-java/trove-1.0.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=0
 SRC_URI=mirror://sourceforge/trove4j/trove-1.0.2.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f28931ad4d956c4ba288977f43a17617
diff --git a/metadata/md5-cache/dev-java/trove-2.1.0 b/metadata/md5-cache/dev-java/trove-2.1.0
index e562b5e9a5ed..854fc878b28e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=940c7326df55f63dff00330904541996
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2 b/metadata/md5-cache/dev-java/trove-3.0.2
index f5b72e405399..666ac62ba132 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=da239c5ab955a61910f4a70bf8f98fbd
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20070407 b/metadata/md5-cache/dev-java/txw2-runtime-20070407
index 48e3b14a5a0d..94afcf52d62a 100644
--- a/metadata/md5-cache/dev-java/txw2-runtime-20070407
+++ b/metadata/md5-cache/dev-java/txw2-runtime-20070407
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 =dev-java/codemodel-2* dev-java/jsr173 dev-java/relaxng-datatype dev-java/rngom dev-java/xsom >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4517935d3f855c6d2fe6a6513b35b8a7
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20070407-r1 b/metadata/md5-cache/dev-java/txw2-runtime-20070407-r1
index 9000215bbf34..f686d40cabca 100644
--- a/metadata/md5-cache/dev-java/txw2-runtime-20070407-r1
+++ b/metadata/md5-cache/dev-java/txw2-runtime-20070407-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c74bcbed5d44ef4fd82c4ca74deaf88
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2 b/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
index 512f0875f051..d9cd68042182 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d48b3c0dea75dc52ddf68a68595257ac
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 77200783927a..2c76e77335fc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 3fee1e6b322e..795a0c2cc2e7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a7015a6dafb84a48faed86cc8de98254
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 e730874d19ea..e049bccca333 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fbc6f3e643fcccaf71c95ef950da7e9d
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r1 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r1
index cfc9a12705b4..d7d5e5883f30 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r1
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r1
@@ -9,5 +9,5 @@ LICENSE=werken.xpath
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0_beta9:1.0_beta9 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9138b768c6601bea67e7807069d9f5ee
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 566480d11a42..06349225a295 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 ad15c468da72..2619ab1252f3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=515ff121af7d631c3042ed91ab8246ae
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.8 b/metadata/md5-cache/dev-java/wstx-3.2.8
index d21c10574032..9f21fc591913 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fccbd0a3207123a7cf469a5374f27702
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.0-r4 b/metadata/md5-cache/dev-java/xalan-2.7.0-r4
index 29fcfecdde8c..741c1a65a5e4 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.0-r4
+++ b/metadata/md5-cache/dev-java/xalan-2.7.0-r4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/javacup dev-java/bcel =dev-java/jakarta-regexp-1.3* >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* ~dev-java/xalan-serializer-2.7.0 >=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_0-src.tar.gz doc? ( mirror://apache/xml/xalan-j/binaries/xalan-j_2_7_0-bin.tar.gz )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e9dc6e3d9d0077b51aeac30003d4169
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.0-r5 b/metadata/md5-cache/dev-java/xalan-2.7.0-r5
index 2cc3a79f4802..8c4ecd32f7f0 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.0-r5
+++ b/metadata/md5-cache/dev-java/xalan-2.7.0-r5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/javacup dev-java/bcel >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* ~dev-java/xalan-serializer-2.7.0 >=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_0-src.tar.gz doc? ( mirror://apache/xml/xalan-j/binaries/xalan-j_2_7_0-bin.tar.gz )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7091a9960757fb872ea333a605e53aa4
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.1 b/metadata/md5-cache/dev-java/xalan-2.7.1
index c6e8678734f2..ee9bcccd5c06 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd8ecbf395906c836a5b4685c6af8c9b
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.0 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.0
index cc55c0549a23..c0fea2bcd493 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.0
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.0
@@ -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_0-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=944e3945da12c364c362f021fdf2e269
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 9c28595b5284..6f5816d716f3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a57782d5094f685685743fcaa15e309
diff --git a/metadata/md5-cache/dev-java/xdoclet-1.2.3 b/metadata/md5-cache/dev-java/xdoclet-1.2.3
index f70b1601130f..5eb52c3aeccc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=102fa03f33a8ec19f17077d8492231a9
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 198406c03880..1bdf119d7182 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 badea149a2a3..783d0a3faac6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa1645ff0761df99a33be75ba4f6314f
diff --git a/metadata/md5-cache/dev-java/xerces-2.9.1 b/metadata/md5-cache/dev-java/xerces-2.9.1
index d0539e24bb41..93de5f99432b 100644
--- a/metadata/md5-cache/dev-java/xerces-2.9.1
+++ b/metadata/md5-cache/dev-java/xerces-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xml-commons-external:1.3 >=dev-java/xml-commo
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.9.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7a556e3fe63681aaaa07a018cb1de194
diff --git a/metadata/md5-cache/dev-java/xjavac-20041208-r5 b/metadata/md5-cache/dev-java/xjavac-20041208-r5
index 3855e257a5f9..400c3ba0c419 100644
--- a/metadata/md5-cache/dev-java/xjavac-20041208-r5
+++ b/metadata/md5-cache/dev-java/xjavac-20041208-r5
@@ -8,5 +8,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-20041208.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=694663fa33ec7673b6fb78c46c445184
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index dc75236160c1..ba0818e81856 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=911af1add47eb868c00c60b798a07540
diff --git a/metadata/md5-cache/dev-java/xjavadoc-1.1-r1 b/metadata/md5-cache/dev-java/xjavadoc-1.1-r1
index 2ca8ac68d942..733bc599ca51 100644
--- a/metadata/md5-cache/dev-java/xjavadoc-1.1-r1
+++ b/metadata/md5-cache/dev-java/xjavadoc-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections =dev-java/junit-3* >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c5f95d4e667f7bb27e0166f72444b3aa
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 145465548ec0..70f6bf7acf76 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25678a0578664292a4e564db5a9e66f0
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.02-r1 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.02-r1
index 77d606cd66ca..f890ed643ef5 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.02-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.02-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.02.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=233c9b075749e298a581e25a1967292b
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 a1d38af564f3..cd0b226b63da 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c5baa4c8206b7b48250a77c3c6e0efc
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 0d1731518dd1..f095b844fda1 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e74966c0513841e742e78eefe50d76bf
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 fcd6b661ca43..be31907d6ad0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=748ddb4ace24f7cc4c8804b99b0852cc
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 69619ebae109..0103c302e7ca 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d099ce1444e0541e8d8b2923fe20fd7
diff --git a/metadata/md5-cache/dev-java/xml-writer-0.2 b/metadata/md5-cache/dev-java/xml-writer-0.2
index a3173aad2b3a..b0595c764a1e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 db0cc94ae709..f99f0314cdd4 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ddcdb218678448b7bcc8cc639f9c3319
diff --git a/metadata/md5-cache/dev-java/xmlc-2.3.1 b/metadata/md5-cache/dev-java/xmlc-2.3.1
index 58aaeaf9d1ed..90174eeabc36 100644
--- a/metadata/md5-cache/dev-java/xmlc-2.3.1
+++ b/metadata/md5-cache/dev-java/xmlc-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/gnu-regexp:1 java-virtuals/servlet-api:2.3 dev-java/log4j:0 dev-java/xml-commons-resolver:0 dev-java/nekohtml:0 dev-java/asm:3 dev-java/ant-core:0 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dccf5ab00d7a1163c9b33ce2240a2f95
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index c9b0dea9e823..44c07efa2d5d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a795d4f62a4dfb6e069aa293bfc8031f
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2
index f34cdcd03070..9a04e715919c 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2
@@ -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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=380d9a64dec967f891a21921d11da618
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 ec655ff6ca17..6aa7dce86b00 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=717547763d26245bd9c1e85391faacfc
diff --git a/metadata/md5-cache/dev-java/xmlrpc-2.0.1 b/metadata/md5-cache/dev-java/xmlrpc-2.0.1
index 519ca9374d58..d1a5fdc98344 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=090913baa6fd9d239e692ba57d898599
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412 b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412
index 9d787896b9e8..430eaba08ec3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c6e1b9f4fd43064be7687b4977b36e7
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r1 b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r1
index 00217bd53e57..4e2a85d823b1 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r1
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 java-virtuals/jaf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=01da09f419e1f74a63b7af3d40735727
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r2 b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r2
index 19a5320ca15c..aa83525961a9 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r2
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412-r2
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/stax-api java-virtuals/jaf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=53784632d6a62404a8917dbb18835347
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.3 b/metadata/md5-cache/dev-java/xmlunit-1.3
index f5941930b73a..5ee2d9e8e832 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3ce83831eb989a4f859b2aec5ce9ca0
diff --git a/metadata/md5-cache/dev-java/xom-1.2.6-r1 b/metadata/md5-cache/dev-java/xom-1.2.6-r1
index 2ef9c4e1909f..221f2f3ebe47 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.6-r1
+++ b/metadata/md5-cache/dev-java/xom-1.2.6-r1
@@ -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.6.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.3-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd8e4d000e8e7ebe7658fe78f9238b8d
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r1 b/metadata/md5-cache/dev-java/xp-0.5-r1
index a8831bcc1fdb..ded55d45e840 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=JamesClark
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=31933e0ef6978d8c0cdd378221e74e08
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 67a25ed22a8f..25e3af8d4313 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=887471b4125b94a2246026bfe796dfe4
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c b/metadata/md5-cache/dev-java/xpp3-1.1.4c
index d1aec8bb22d6..fb829a2e8f8f 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4b4c5c4f9b24b0cf2f06fd6e2c29081a
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 a6e4d0bdd1ff..68e2c028cee0 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=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9d499617cfb10adbc237e5ff9eead0b
diff --git a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r1 b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r1
index cb60d5b1916b..b4f4f6f8bd8d 100644
--- a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r1
+++ b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging dev-java/xpp3 dev-java/jaxme dev-java/jibx 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6f78486fc40b54d57fa5ccb7b682c031
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 0a39958d493d..3db6836c5d69 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dcc720d44ce8ca2421f184188cd56bd6
diff --git a/metadata/md5-cache/dev-java/xsdlib-20050627-r1 b/metadata/md5-cache/dev-java/xsdlib-20050627-r1
index 628b1da63309..f954734bc089 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20050627-r1
+++ b/metadata/md5-cache/dev-java/xsdlib-20050627-r1
@@ -8,5 +8,5 @@ LICENSE=as-is Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/xerces-2.7 dev-java/relaxng-datatype >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/xsdlib.20050627.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=db2ee5738769657744ca9ad90db9cf9d
diff --git a/metadata/md5-cache/dev-java/xsdlib-20050627-r2 b/metadata/md5-cache/dev-java/xsdlib-20050627-r2
index aa50f4848068..940e47ea0ced 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20050627-r2
+++ b/metadata/md5-cache/dev-java/xsdlib-20050627-r2
@@ -9,5 +9,5 @@ LICENSE=as-is Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/relaxng-datatype: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/xsdlib.20050627.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=469884ab9cd6751b1c8c8e77fc004a89
diff --git a/metadata/md5-cache/dev-java/xsom-20060901 b/metadata/md5-cache/dev-java/xsom-20060901
index e6b339970784..f93f0bde4cf9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd0b5fabddbb73c53c3e057afb75d3bb
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 0a5624ecf0a2..e4553d025446 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 test? ( dev-java/ant-junit dev-java/ant-trax dev-java/junit:0 dev-java/xml-writer:0 dev-java/commons-lang:2.1 dev-java/jmock:1.0 dev-java/jakarta-oro:2.0 dev-java/stax:0 dev-java/wstx:3.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://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/1.3.1/xstream-distribution-1.3.1-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af7459b37f04f6eef12488afef50a3c8
diff --git a/metadata/md5-cache/dev-java/xt-20051206-r1 b/metadata/md5-cache/dev-java/xt-20051206-r1
index 64364d8f34b5..068c2d545e15 100644
--- a/metadata/md5-cache/dev-java/xt-20051206-r1
+++ b/metadata/md5-cache/dev-java/xt-20051206-r1
@@ -8,5 +8,5 @@ LICENSE=JamesClark
 RDEPEND=>=virtual/jre-1.4 dev-java/xp ~dev-java/servletapi-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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=750d23668d19c376aa3c69a06e926f76
diff --git a/metadata/md5-cache/dev-java/xt-20051206-r2 b/metadata/md5-cache/dev-java/xt-20051206-r2
index 6d6bb190933f..45e132cc398d 100644
--- a/metadata/md5-cache/dev-java/xt-20051206-r2
+++ b/metadata/md5-cache/dev-java/xt-20051206-r2
@@ -9,5 +9,5 @@ LICENSE=JamesClark
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=644c6c999b86b855bec5185a928bf756
diff --git a/metadata/md5-cache/dev-java/xz-java-1.0 b/metadata/md5-cache/dev-java/xz-java-1.0
index 53e083ee903c..930bc7c0f6cb 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.0
+++ b/metadata/md5-cache/dev-java/xz-java-1.0
@@ -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.0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89bf61e79e49cbaa52ce610725db75d4
diff --git a/metadata/md5-cache/dev-java/zemberek-2.0 b/metadata/md5-cache/dev-java/zemberek-2.0
index 91cbe0f15a44..852b04c0c559 100644
--- a/metadata/md5-cache/dev-java/zemberek-2.0
+++ b/metadata/md5-cache/dev-java/zemberek-2.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=0
 SRC_URI=http://zemberek.googlecode.com/files/zemberek-2.0-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=508b81cc2960fd1dec4542e3c14be24c
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 52523581e7f9..45676d7491d2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 a5db4f4c0420..85929e41abfc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f943a0fa573239b8c6445e7a2e7da4c9
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64 b/metadata/md5-cache/dev-java/zeus-jscl-1.64
index 704c4b31e172..67e84da6de09 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aca3941b24c74c1858065ac708b0cc32
diff --git a/metadata/md5-cache/dev-lang/clojure-1.2.0 b/metadata/md5-cache/dev-lang/clojure-1.2.0
index 5855dc165f03..47d9e3a85c5e 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.2.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.2.0
@@ -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=1.2
 SRC_URI=http://github.com/downloads/clojure/clojure/clojure-1.2.0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=24b18fb271b0d882313f3d4b9c273252
diff --git a/metadata/md5-cache/dev-lang/clojure-1.3.0 b/metadata/md5-cache/dev-lang/clojure-1.3.0
index f27c21c88e82..a93cdc5ae5ba 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.3.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.3.0
@@ -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=1.3
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.3.0 -> clojure-1.3.0.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=51eeba1f1006d140b35a6904a5a20841
diff --git a/metadata/md5-cache/dev-lang/clojure-1.4.0 b/metadata/md5-cache/dev-lang/clojure-1.4.0
index d8909cb1afa8..0e6f84d15019 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.4.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.4.0
@@ -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=1.4
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.4.0 -> clojure-1.4.0.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bd29321af0d12af9e4c2498d63b6e465
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
index 9c6cce27b518..33d5c900688c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05f22cce6458a27f224651807b253fd0
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index f7e8be108e85..d38ed6fe2988 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=946e5e79a6bf2289852f7c1d27be3c69
diff --git a/metadata/md5-cache/dev-lang/scala-2.9.0.1 b/metadata/md5-cache/dev-lang/scala-2.9.0.1
index 2659604f6a99..12e0961ab874 100644
--- a/metadata/md5-cache/dev-lang/scala-2.9.0.1
+++ b/metadata/md5-cache/dev-lang/scala-2.9.0.1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode )
 RDEPEND=>=virtual/jre-1.6 !dev-java/scala-bin >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=!binary? ( http://www.scala-lang.org/downloads/distrib/files/scala-2.9.0.1-sources.txz -> scala-2.9.0.1.tar.xz ) binary? ( http://dev.gentoo.org/~ali_bush/distfiles/scala-2.9.0.1-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=87a7dca4e6dc1362f3c892ecc79e05db
diff --git a/metadata/md5-cache/dev-lang/scala-2.9.1 b/metadata/md5-cache/dev-lang/scala-2.9.1
index dd07ca32ee1f..a7c23bc02e76 100644
--- a/metadata/md5-cache/dev-lang/scala-2.9.1
+++ b/metadata/md5-cache/dev-lang/scala-2.9.1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode )
 RDEPEND=>=virtual/jre-1.6 !dev-java/scala-bin >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=!binary? ( http://www.scala-lang.org/downloads/distrib/files/scala-2.9.1.final-sources.txz -> scala-2.9.1.tar.xz ) binary? ( http://dev.gentoo.org/~ali_bush/distfiles/scala-2.9.1-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a5d3f98d94152ae62305fdf4e1eb6c7
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.1.1 b/metadata/md5-cache/dev-lang/tuprolog-2.1.1
index 6ba4b746d77c..e26c7880eebb 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.1.1
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/tuprolog/2p-2.1.1.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ea348fabaf2c7b1132172f018f647518
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.3.0_alpha b/metadata/md5-cache/dev-lang/tuprolog-2.3.0_alpha
index 7d3bec5e89a6..7e6f1224a892 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.3.0_alpha
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.3.0_alpha
@@ -8,5 +8,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.3.0alpha.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4e54a91addbca1eb0f85ed0e18cf274
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.3.1_beta b/metadata/md5-cache/dev-lang/tuprolog-2.3.1_beta
index b1ba95b3a5db..e95187149c4d 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.3.1_beta
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.3.1_beta
@@ -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.3.1.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f8288e3a9b86058c5e7c47292bfe95af
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 0b82a78c34b6..e076fcc7922f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28971352aae5c2192bd74d28086711a6
diff --git a/metadata/md5-cache/dev-libs/boost-1.48.0-r2 b/metadata/md5-cache/dev-libs/boost-1.48.0-r2
index c952626960f6..406348f2f00b 100644
--- a/metadata/md5-cache/dev-libs/boost-1.48.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.48.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=4
 HOMEPAGE=http://www.boost.org/
 IUSE=debug doc +eselect icu mpi python static-libs test tools
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.4 python? ( dev-lang/python )
 SLOT=1.48
 SRC_URI=mirror://sourceforge/boost/boost_1_48_0.tar.bz2
 _eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5b0ccef350e05890355d4092ef4f908e
+_md5_=6ec0fb9ce1cf28964d8c12d20a6e0524
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-0.10.8 b/metadata/md5-cache/dev-libs/gobject-introspection-0.10.8
index 4a9fd5dfa250..005be57fabfb 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-0.10.8
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-0.10.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24:2 virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.24:2 virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
 EAPI=3
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
 IUSE=doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
-RDEPEND=>=dev-libs/glib-2.24:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=>=dev-libs/glib-2.24:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d2032073ea1611aa3bd20e5320a68155
+_md5_=830305de04452e141e4dda9369a4aa8b
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r1
index 2f868c04e66c..65fc6cceda51 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) test? ( x11-libs/cairo ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) test? ( x11-libs/cairo ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
 IUSE=doc test
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
-RDEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.30/gobject-introspection-1.30.0.tar.xz mirror://gentoo/gobject-introspection-1.30.0-patches-1.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d7fca57d41f19a4dd63cc9444f459dae
+_md5_=cb39f3851646b5d95704dd65e1c4a3bd
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r2 b/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r2
index 48e38f96fdf1..2e13256a23fe 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.30.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi virtual/pkgconfig sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
@@ -7,8 +7,8 @@ IUSE=doc test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 PDEPEND=x11-libs/cairo[glib]
-RDEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=>=dev-libs/glib-2.29.7:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.30/gobject-introspection-1.30.0.tar.xz mirror://gentoo/gobject-introspection-1.30.0-patches-1.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=aff772b59c1e75a2fb7b46672e0cba15
+_md5_=2ba0aa35176f74dff731a1503234f373
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.0
index d2fc77630263..416dd39c4e30 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7*
+DEPEND=>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
@@ -7,8 +7,8 @@ IUSE=doc doctool test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 PDEPEND=x11-libs/cairo[glib]
-RDEPEND=>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7*
+RDEPEND=>=dev-libs/gobject-introspection-common-1.32.0 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.0.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=69191e5e1cb4849807663a9d835e1e88
+_md5_=9ac715807080f650b13f9ea0d32c41aa
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
index acbe0ae19290..cf6d482c0151 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7*
+DEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi virtual/pkgconfig sys-devel/bison sys-devel/flex doc? ( >=dev-util/gtk-doc-1.15 ) app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
@@ -7,8 +7,8 @@ IUSE=doc doctool test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 PDEPEND=x11-libs/cairo[glib]
-RDEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7*
+RDEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3dee7daebe0ae47a563f06d67b60c5c4
+_md5_=68c73149e20470f438fd0f47b822178b
diff --git a/metadata/md5-cache/dev-libs/icu-49.1.1-r1 b/metadata/md5-cache/dev-libs/icu-49.1.1-r1
index f4728a55afc6..f96d5057039f 100644
--- a/metadata/md5-cache/dev-libs/icu-49.1.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-49.1.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=4
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-src.tgz doc? ( http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-docs.zip )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d529f93fd0c101173289a4a3ff5065c8
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1f04b4394dbb1dc7aa70120a1ea2a11f
diff --git a/metadata/md5-cache/dev-libs/json-c-0.9-r1 b/metadata/md5-cache/dev-libs/json-c-0.9-r1
index e5fe7757d698..36354e18aea5 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.9-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.9-r1
@@ -3,8 +3,8 @@ DESCRIPTION=A JSON implementation in C
 EAPI=4
 HOMEPAGE=http://oss.metaparadigm.com/json-c/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz
-_md5_=ec0b50eb406567a530000e7cbb1b7d14
+_md5_=a41f7ebeb8d73bc8cda561332f228ca1
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1 b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
index fbc09d670486..5cb1aaecf4f8 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) python? ( dev-util/fix-la-relink-command ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=4
 HOMEPAGE=http://www.xmlsoft.org/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4c0c5eb91bc025c625bf39fdf31bd341
+_md5_=61afb5690522c78febdc89b5478d7e1f
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.7.7 b/metadata/md5-cache/dev-libs/uriparser-0.7.7
index 3925e03156bd..37be5dd975a6 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.7.7
+++ b/metadata/md5-cache/dev-libs/uriparser-0.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=4
 HOMEPAGE=http://uriparser.sourceforge.net/
 IUSE=doc qt4 test unicode
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=test? ( unicode )
 SLOT=0
 SRC_URI=mirror://sourceforge/uriparser/uriparser-0.7.7.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=98e99238d9a83b5cca5d388e046eed14
+_md5_=ac06428236318d871917b2ad93a73b0a
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 a321335fe444..1483f2fb98cf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=81fe1cc597f7711dc263dc05916cca54
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0 b/metadata/md5-cache/dev-lisp/abcl-0.20.0
index 2f6a7183b27a..77b0bb782aea 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0d580a240f31078ae4f31a6664aba344
diff --git a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.3 b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.3
deleted file mode 100644
index 0895c24d6f7f..000000000000
--- a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=media-libs/flac dev-lang/perl
-DESCRIPTION=Access to FLAC audio metadata
-HOMEPAGE=http://search.cpan.org/dist/Audio-FLAC-Header/
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=media-libs/flac dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-FLAC-Header-2.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2a5089fcc6b893ff02e7ae2ee91b4c48
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.41 b/metadata/md5-cache/dev-perl/CGI-Session-4.41
deleted file mode 100644
index c3ef88aa6e92..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=virtual/perl-CGI-3.26 virtual/perl-Module-Build test? ( virtual/perl-Test-Simple dev-perl/Cgi-Simple dev-perl/Test-Pod ) dev-lang/perl[-build]
-DESCRIPTION=persistent session data in CGI applications
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/CGI-Session/
-IUSE=test
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=virtual/perl-CGI-3.26 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.41.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7b83974a581833369c1bb05d96f4e244
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.18 b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.18
deleted file mode 100644
index c7dbe7be10cf..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-perl/libwww-perl virtual/perl-IO-Compress dev-perl/HTTP-Server-Simple >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-lang/perl
-DESCRIPTION=Inject modules into a CPAN::Mini mirror.
-HOMEPAGE=http://search.cpan.org/~ssoriche/CPAN-Mini-Inject-0.18/
-KEYWORDS=x86
-LICENSE=Artistic
-RDEPEND=dev-perl/libwww-perl virtual/perl-IO-Compress dev-perl/HTTP-Server-Simple >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SS/SSORICHE/CPAN-Mini-Inject-0.18.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0009ba5ea51a69de351cf3492a264d7a
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.300.0 b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.300.0
deleted file mode 100644
index 3321f872ba0d..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.300.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl virtual/perl-IO-Compress virtual/perl-Archive-Tar virtual/perl-File-Path virtual/perl-File-Temp >=virtual/perl-Module-Build-0.380.0 >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-perl/File-Slurp dev-perl/yaml dev-lang/perl[-build]
-DESCRIPTION=Inject modules into a CPAN::Mini mirror.
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/CPAN-Mini-Inject/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/libwww-perl virtual/perl-IO-Compress virtual/perl-Archive-Tar virtual/perl-File-Path virtual/perl-File-Temp >=virtual/perl-Module-Build-0.380.0 >=dev-perl/CPAN-Mini-0.32 dev-perl/CPAN-Checksums dev-perl/File-Slurp dev-perl/yaml dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/CPAN-Mini-Inject-0.30.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=df01d34d6e0a4bba5d55a532ada8a548
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.06.0 b/metadata/md5-cache/dev-perl/Cairo-1.06.0
deleted file mode 100644
index 4f0d35d7f42a..000000000000
--- a/metadata/md5-cache/dev-perl/Cairo-1.06.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 test? ( dev-perl/Test-Number-Delta )
-DESCRIPTION=Perl interface to the cairo library
-HOMEPAGE=http://search.cpan.org/dist/Cairo/
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/cairo-1.0.0
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.060.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2dcec1c229b866ef89b71cacf06fecbd
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.62.0 b/metadata/md5-cache/dev-perl/Cairo-1.62.0
deleted file mode 100644
index d8d066cb8c94..000000000000
--- a/metadata/md5-cache/dev-perl/Cairo-1.62.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
-DESCRIPTION=Perl interface to the cairo library
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Cairo/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.062.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a511dfaa7052147c1c3b9dd55d17daba
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.81.0 b/metadata/md5-cache/dev-perl/Cairo-1.81.0
deleted file mode 100644
index 071dc24b5e6e..000000000000
--- a/metadata/md5-cache/dev-perl/Cairo-1.81.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205.0 >=dev-perl/extutils-pkgconfig-1.70.0 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
-DESCRIPTION=Perl interface to the cairo library
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Cairo/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Cairo-1.081.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=747c4deb34e34ce7ec190a41e8ec2a09
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.82.0 b/metadata/md5-cache/dev-perl/Cairo-1.82.0
deleted file mode 100644
index 9f7ae267e147..000000000000
--- a/metadata/md5-cache/dev-perl/Cairo-1.82.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/cairo-1.0.0 >=dev-perl/extutils-depends-0.205.0 >=dev-perl/extutils-pkgconfig-1.70.0 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl[-build]
-DESCRIPTION=Perl interface to the cairo library
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Cairo/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.082.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5d85452f0223d7288896c47ad562f907
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.08 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.08
deleted file mode 100644
index 65f94d2292d2..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.08
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build dev-lang/perl[-build]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.08.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ef32740663b005f5dc1aeb9754bf6fb0
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.110.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.110.0
deleted file mode 100644
index 6e496544697c..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.110.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.11.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=67ee914cddcefb80872571260c800a1a
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.120.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.120.0
deleted file mode 100644
index 34c5c0f744e4..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.120.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.12.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b9fe1237a09842d5313d2590dc841a0b
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.150.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.150.0
deleted file mode 100644
index 4c54507b10c3..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.150.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.15.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6364c70f47c3cc9c301d1b6e5344a5c1
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.160.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.160.0
deleted file mode 100644
index 6613b509fbc2..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.160.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.16.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d543e394b0ad0ef093dbce330b885a5c
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.31 b/metadata/md5-cache/dev-perl/Class-Accessor-0.31
deleted file mode 100644
index aa2591d89d5e..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-lang/perl
-DESCRIPTION=Automated accessor generation
-HOMEPAGE=http://search.cpan.org/~kasei/Class-Accessor-0.31/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3c53ef3832c990f6ef8d3d6ca8ba3a47
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.57 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.57
deleted file mode 100644
index edcf917fd5d8..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.57
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.57.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=11400dadd57a2fe43efd3f4cb2a6a2d7
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.680.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.680.0
deleted file mode 100644
index 337ce4c909d3..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.680.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.68.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7de76d06dfec7121cf2608bd44239b50
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.690.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.690.0
deleted file mode 100644
index 44c1ef1b53c4..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.690.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.69.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=192bfaa07269dccb6549ff675025cc4e
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.700.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.700.0
deleted file mode 100644
index 937720c090bb..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.700.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.70.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ef3634844d5d1355328307b0b057ec1e
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.720.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.720.0
deleted file mode 100644
index 64fcfad9c4b7..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.720.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.72.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=05d46ca94afdda2760ea2e1c9f28e453
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.730.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.730.0
deleted file mode 100644
index 6daf478ac360..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.730.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.73.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8636c2b3eae05acaea4c16e74352fd0d
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.10 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.10
deleted file mode 100644
index 5eb29a0c5a37..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=dev-lang/perl-5
-DESCRIPTION=Crypt::Blowfish module for perl
-HOMEPAGE=http://search.cpan.org/~dparis/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=>=dev-lang/perl-5
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.10.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7908d6e8e685c8007dbf144f7034183d
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.5 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.5
deleted file mode 100644
index 80d8f3ee207e..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/cracklib test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Perl interface to Alec Muffett's Cracklib
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Crypt-Cracklib/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=Artistic
-RDEPEND=sys-libs/cracklib dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c326d129097af254108ba1e14f878cdc
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.22 b/metadata/md5-cache/dev-perl/Devel-StackTrace-1.22
deleted file mode 100644
index 30e0800b6951..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Module-Build-0.28 virtual/perl-File-Spec dev-lang/perl[-build]
-DESCRIPTION=Devel-StackTrace module for perl
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Devel-StackTrace/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=virtual/perl-File-Spec dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.22.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=cb7725690ac32d17918043324e66e4c0
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.01-r1 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.01-r1
deleted file mode 100644
index e204e209e9a9..000000000000
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.01-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=virtual/perl-digest-base virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl
-DESCRIPTION=Keyed Hashing for Message Authentication
-HOMEPAGE=http://search.cpan.org/doc/GAAS/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=virtual/perl-digest-base virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/GAAS/Digest-HMAC-1.01.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fea2bff63e9277cff91995ecdbae8f11
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.02 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.02
deleted file mode 100644
index ad248b66c579..000000000000
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl[-build]
-DESCRIPTION=Keyed Hashing for Message Authentication
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Digest-HMAC/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.02.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c29b502aec7b2c569fe63c7ffd67ffab
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0
index 7cb2fa14874e..5cda2566966b 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl[-build]
 DESCRIPTION=Keyed Hashing for Message Authentication
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Digest-HMAC/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=02b069ae44b985fca8d7f8c72faacf7f
+_md5_=5c597ef24e804240793031f0220868f3
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.42 b/metadata/md5-cache/dev-perl/File-Remove-1.42
deleted file mode 100644
index 91382d88c9b9..000000000000
--- a/metadata/md5-cache/dev-perl/File-Remove-1.42
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl
-DESCRIPTION=Remove files and directories
-HOMEPAGE=http://search.cpan.org/dist/File-Remove/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.42.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=285cabbb0576d389d41f25358201d723
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.500.0 b/metadata/md5-cache/dev-perl/File-Remove-1.500.0
deleted file mode 100644
index 251c771062de..000000000000
--- a/metadata/md5-cache/dev-perl/File-Remove-1.500.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
-DESCRIPTION=Remove files and directories
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/File-Remove/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.50.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0f0e697d77bf21a8e6388c1e789cb4b7
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.08 b/metadata/md5-cache/dev-perl/Fuse-0.08
deleted file mode 100644
index bdd458e61009..000000000000
--- a/metadata/md5-cache/dev-perl/Fuse-0.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=sys-fs/fuse dev-lang/perl
-DESCRIPTION=Fuse module for perl
-HOMEPAGE=http://search.cpan.org/dist/Fuse/
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/fuse dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DP/DPAVLIN/Fuse-0.08.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=591cdc7fa566b44a57937e85043cfbc4
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.130.0 b/metadata/md5-cache/dev-perl/Fuse-0.130.0
deleted file mode 100644
index d0b5b11f442f..000000000000
--- a/metadata/md5-cache/dev-perl/Fuse-0.130.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-fs/fuse dev-lang/perl[-build]
-DESCRIPTION=Fuse module for perl
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Fuse/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/fuse dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DP/DPAVLIN/Fuse-0.13.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=87c8be25296a7b9a989d499431d294aa
diff --git a/metadata/md5-cache/dev-perl/GStreamer-0.09 b/metadata/md5-cache/dev-perl/GStreamer-0.09
deleted file mode 100644
index ef97dc92ccb8..000000000000
--- a/metadata/md5-cache/dev-perl/GStreamer-0.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND==media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.120 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig
-DESCRIPTION=Perl bindings for GStreamer
-HOMEPAGE=http://search.cpan.org/~tsch/
-KEYWORDS=amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.120
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/GStreamer-0.09.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=29159f205a83dd6cc5a001b129b6dd07
diff --git a/metadata/md5-cache/dev-perl/GStreamer-0.160.0 b/metadata/md5-cache/dev-perl/GStreamer-0.160.0
deleted file mode 100644
index 211529f94b60..000000000000
--- a/metadata/md5-cache/dev-perl/GStreamer-0.160.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.180 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig dev-lang/perl[-build]
-DESCRIPTION=Perl bindings for GStreamer
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/GStreamer/
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND==media-libs/gstreamer-0.10* >=dev-perl/glib-perl-1.180 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/GStreamer-0.16.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=282ec67c477ac0a8ab41de0bfd783310
diff --git a/metadata/md5-cache/dev-perl/GStreamer-Interfaces-0.04 b/metadata/md5-cache/dev-perl/GStreamer-Interfaces-0.04
deleted file mode 100644
index 2525f3602c84..000000000000
--- a/metadata/md5-cache/dev-perl/GStreamer-Interfaces-0.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND==media-libs/gst-plugins-base-0.10* >=dev-perl/GStreamer-0.06 >=dev-perl/glib-perl-1.180 >=dev-perl/extutils-depends-0.205 >=dev-perl/extutils-pkgconfig-1.07 virtual/pkgconfig
-DESCRIPTION=Perl interface to the GStreamer Interfaces library
-HOMEPAGE=http://search.cpan.org/~tsch
-KEYWORDS=amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==media-libs/gst-plugins-base-0.10* >=dev-perl/GStreamer-0.06 >=dev-perl/glib-perl-1.180
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/GStreamer-Interfaces-0.04.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=30cb38dfc7edafcd23935ee18d7d19f5
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.42 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.42
deleted file mode 100644
index 5f27772435fa..000000000000
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/gnupg-1.2.1-r1 dev-perl/Any-Moose dev-lang/perl[-build]
-DESCRIPTION=GnuPG::Interface is a Perl module interface to interacting with GnuPG.
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/GnuPG-Interface/
-KEYWORDS=amd64 hppa ppc x86 ~ppc-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=app-crypt/gnupg-1.2.1-r1 dev-perl/Any-Moose dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-0.42.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=364de19d1990cd42b1de01193a929485
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.440.0 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.440.0
deleted file mode 100644
index f866497ce276..000000000000
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.440.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl[-build]
-DESCRIPTION=GnuPG::Interface is a Perl module interface to interacting with GnuPG.
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/GnuPG-Interface/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=app-crypt/gnupg-1.2.1-r1 >=virtual/perl-Math-BigInt-1.78 dev-perl/Any-Moose dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-0.44.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e4e3498409c26755ce9f8615e4f5478f
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.38 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.38
deleted file mode 100644
index 9f23c0b915c8..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.38
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl dev-perl/XML-DOM dev-lang/perl[-build]
-DESCRIPTION=A WebDAV client library for Perl5
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/HTTP-DAV/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/libwww-perl dev-perl/XML-DOM dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OP/OPERA/HTTP-DAV-0.38.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3630685b06145d341bfe1ada0f2fa3ac
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.460.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.460.0
deleted file mode 100644
index 14ea397d6be1..000000000000
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.460.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl[-build]
-DESCRIPTION=A WebDAV client library for Perl5
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/HTTP-DAV/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.46.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ffa69a8cd8be3b289623fc159a90bd5f
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.63 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.63
deleted file mode 100644
index 96a46b3435a0..000000000000
--- a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.63
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Socket6 virtual/perl-Module-Build dev-lang/perl[-build]
-DESCRIPTION=Work with IO sockets in ipv6
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/IO-Socket-INET6/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/Socket6 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.63.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bff553d4493c6b606dcb414697c7f91d
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.670.0 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.670.0
deleted file mode 100644
index b4e45a410c08..000000000000
--- a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.670.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Socket6 virtual/perl-Module-Build dev-lang/perl[-build]
-DESCRIPTION=Work with IO sockets in ipv6
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/IO-Socket-INET6/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/Socket6 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.67.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=45653079f22e88f6e78d59b2d1e322f2
diff --git a/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0 b/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0
index 7a3154f43dcc..7b6acf694e97 100644
--- a/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0
+++ b/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Translate signal names to/from numbers
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/IPC-Signal/
-KEYWORDS=amd64 ia64 ~ppc sparc x86
+KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=94071d7a91b09cbac9c4423a31190ceb
+_md5_=7163651bb09e834e204e2535cf452a8d
diff --git a/metadata/md5-cache/dev-perl/JSON-2.27 b/metadata/md5-cache/dev-perl/JSON-2.27
deleted file mode 100644
index ac5bf4807f91..000000000000
--- a/metadata/md5-cache/dev-perl/JSON-2.27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=parse and convert to JSON (JavaScript Object Notation)
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/JSON/
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.27.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7c1ba1f85ae59bf75df1b4954856cabe
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.25 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.25
deleted file mode 100644
index 743298e0cb84..000000000000
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Parse-RecDescent-1.94 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
-DESCRIPTION=IMAP client module for Perl
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Mail-IMAPClient/
-IUSE=test
-KEYWORDS=alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Parse-RecDescent-1.94 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.25.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=eac6384130bbfded49afd49c6ca3d549
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.290.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.290.0
deleted file mode 100644
index cccadc1f31fb..000000000000
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.290.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Parse-RecDescent-1.94 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
-DESCRIPTION=IMAP client module for Perl
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Mail-IMAPClient/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Parse-RecDescent-1.94 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.29.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=18939a377aa31ce7537e27214c8ed7fa
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.13 b/metadata/md5-cache/dev-perl/Module-Refresh-0.13
deleted file mode 100644
index bfc6e61b0ecf..000000000000
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-lang/perl
-DESCRIPTION=Refresh %INC files when updated on disk
-HOMEPAGE=http://search.cpan.org/dist/Module-Refresh/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Module-Refresh-0.13.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=72d27873372699643d66f3c74095bc4e
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.160.0 b/metadata/md5-cache/dev-perl/Module-Refresh-0.160.0
deleted file mode 100644
index f0a0537b41df..000000000000
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.160.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Path-Class ) dev-lang/perl[-build]
-DESCRIPTION=Refresh %INC files when updated on disk
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Module-Refresh/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Module-Refresh-0.16.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6fdaac3bdc1d552302a3cd12b4541499
diff --git a/metadata/md5-cache/dev-perl/Mouse-0.40 b/metadata/md5-cache/dev-perl/Mouse-0.40
deleted file mode 100644
index 2f58b3eb02e1..000000000000
--- a/metadata/md5-cache/dev-perl/Mouse-0.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Sub-Uplevel dev-perl/Test-Exception >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
-DESCRIPTION=Moose minus the antlers
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Mouse/
-IUSE=test
-KEYWORDS=~amd64 hppa ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.40.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=614d98bac3d3ff6347368e54fcd2d07d
diff --git a/metadata/md5-cache/dev-perl/Mouse-0.930.0 b/metadata/md5-cache/dev-perl/Mouse-0.930.0
deleted file mode 100644
index cf3a7282196c..000000000000
--- a/metadata/md5-cache/dev-perl/Mouse-0.930.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-ExtUtils-ParseXS-2.21 test? ( dev-perl/Sub-Uplevel >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
-DESCRIPTION=Moose minus the antlers
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Mouse/
-IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=virtual/perl-XSLoader dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.93.tar.gz mirror://gentoo/Mouse-0.64-ppport.h.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a7a187776a6cb37b1fb8a81b251b794a
diff --git a/metadata/md5-cache/dev-perl/Net-CUPS-0.59 b/metadata/md5-cache/dev-perl/Net-CUPS-0.59
deleted file mode 100644
index ce0215cbcedf..000000000000
--- a/metadata/md5-cache/dev-perl/Net-CUPS-0.59
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=net-print/cups-1.1.21 dev-lang/perl test? ( virtual/perl-Test-Simple )
-DESCRIPTION=CUPS C API Interface
-HOMEPAGE=http://search.cpan.org/dist/Net-CUPS/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=>=net-print/cups-1.1.21 dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DH/DHAGEMAN/Net-CUPS-0.59.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=18ec93bcc2b49d6bead5b7e36bccce45
diff --git a/metadata/md5-cache/dev-perl/PDF-API2-0.57 b/metadata/md5-cache/dev-perl/PDF-API2-0.57
deleted file mode 100644
index c798d6665ca8..000000000000
--- a/metadata/md5-cache/dev-perl/PDF-API2-0.57
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=virtual/perl-IO-Compress dev-lang/perl
-DESCRIPTION=A Perl Module Chain to faciliate the Creation and Modification of High-Quality "Portable Document Format (aka. PDF)" Files
-HOMEPAGE=http://search.cpan.org/~areibens/
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=|| ( Artistic LGPL-2 )
-RDEPEND=virtual/perl-IO-Compress dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AR/AREIBENS/PDF-API2-0.57.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=634b2aceada73c0f69216ecb75612143
diff --git a/metadata/md5-cache/dev-perl/PPI-1.212 b/metadata/md5-cache/dev-perl/PPI-1.212
deleted file mode 100644
index 1a81566d80c3..000000000000
--- a/metadata/md5-cache/dev-perl/PPI-1.212
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Scalar-List-Utils-1.20 >=dev-perl/Params-Util-1.00 >=dev-perl/Clone-0.30 >=virtual/perl-Digest-MD5-2.35 dev-perl/IO-String >=dev-perl/List-MoreUtils-0.16 >=virtual/perl-Storable-2.17 test? ( >=dev-perl/File-Remove-1.42 >=virtual/perl-Test-Simple-0.86 >=dev-perl/Test-NoWarnings-0.084 >=virtual/perl-File-Spec-0.84 dev-perl/Test-SubCalls dev-perl/Test-Object >=dev-perl/Class-Inspector-1.22 ) dev-lang/perl[-build]
-DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/PPI/
-IUSE=test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-Scalar-List-Utils-1.20 >=dev-perl/Params-Util-1.00 >=dev-perl/Clone-0.30 >=virtual/perl-Digest-MD5-2.35 dev-perl/IO-String >=dev-perl/List-MoreUtils-0.16 >=virtual/perl-Storable-2.17 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.212.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9e6117cb8edd05419ac34d51e923c148
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.106 b/metadata/md5-cache/dev-perl/Perl-Critic-1.106
deleted file mode 100644
index 58bca98fad46..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.106
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.205 >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Critique Perl source code for best-practices
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
-IUSE=test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.205 >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.106.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=99309b82c34a24a58abaea5d4130ce21
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.111 b/metadata/md5-cache/dev-perl/Perl-Critic-1.111
deleted file mode 100644
index 32e4900ec4ab..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.111
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.208 dev-perl/PPIx-Utilities >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Critique Perl source code for best-practices
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
-IUSE=test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/String-Format dev-perl/perltidy >=dev-perl/PPI-1.208 dev-perl/PPIx-Utilities >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class virtual/perl-version dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.111.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=015c296186cc10729560bc6342cf06b5
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.116.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.116.0
deleted file mode 100644
index 0d4136ecc9ba..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.116.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/perltidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.19.0 dev-perl/Pod-Spell >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 virtual/perl-Module-Build test? ( dev-perl/Test-Deep dev-perl/PadWalker dev-perl/Test-Memory-Cycle dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Critique Perl source code for best-practices
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/perltidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.19.0 dev-perl/Pod-Spell >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/Perl-Critic-1.116.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=373dcfb1166888dc7c3cb008ff4ba94b
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0
index 5bbde86cb0fb..1fa4d00abe16 100644
--- a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0
+++ b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/IPC-Signal dev-lang/perl[-build]
 DESCRIPTION=Interpret and act on wait() status values
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Proc-WaitStat/
-KEYWORDS=amd64 ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/IPC-Signal dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3a02c409ea757e1afdf14e99f54d87c5
+_md5_=a1b0b599adc0030780a5c486de83336b
diff --git a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r5 b/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r5
deleted file mode 100644
index 94d3b3a26d99..000000000000
--- a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4
-DESCRIPTION=Perl library for parsing the output of nsgmls
-HOMEPAGE=http://search.cpan.org/author/DMEGG/SGMLSpm-1.03ii/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.0-r12
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz
-_md5_=392a8175ccb1f9bed7db0d138fea272a
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.0100 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.0100
deleted file mode 100644
index b0e97e9c7267..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.0100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
-IUSE=test
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0100.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2ac61aab5ed2dc5d2a21ad462a8e53f7
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.30.0 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.30.0
deleted file mode 100644
index 0c6f180c313e..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.30.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0300.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e40ee48195e3c6a49cba10eaef815fc3
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.50.0 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.50.0
deleted file mode 100644
index e79038e13b97..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.50.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0500.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=53304c329c8c5cbf8e6aa44c86c9b9b4
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.100 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.100
deleted file mode 100644
index 9c1f14d6bf39..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0601.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=70d19f67c741a5ccf783b7e49727ae11
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.200 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.200
deleted file mode 100644
index b88ada5531de..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.60.200
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl[-build]
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Statistics-Descriptive/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0602.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=46e9c4db54d313080992f35f3ce8c605
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.003 b/metadata/md5-cache/dev-perl/Test-Fatal-0.003
deleted file mode 100644
index fcd58c70046e..000000000000
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.003
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Try-Tiny-0.07 >=virtual/perl-ExtUtils-MakeMaker-6.31 test? ( >=virtual/perl-Test-Simple-0.96 ) dev-lang/perl[-build]
-DESCRIPTION=Incredibly simple helpers for testing code with exceptions
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Test-Fatal/
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Try-Tiny-0.07 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.003.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=18c35fe84fdcab58874fb04b45026197
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.10.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.10.0
index ff508deb98f4..49e2229d4f28 100644
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.10.0
+++ b/metadata/md5-cache/dev-perl/Test-Fatal-0.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Incredibly simple helpers for testing code with exceptions
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Test-Fatal/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=24b07f7cdc685d2bb807d7772bb0a18a
+_md5_=3f72ac60d07c8179b28b7bbd158af6d8
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.6.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.6.0
deleted file mode 100644
index 2d53531d6e51..000000000000
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
-DESCRIPTION=Incredibly simple helpers for testing code with exceptions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Test-Fatal/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.006.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=09cedf3801bf3be5ce154e2339a57cf4
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.8.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.8.0
deleted file mode 100644
index acae7985e0d8..000000000000
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
-DESCRIPTION=Incredibly simple helpers for testing code with exceptions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Test-Fatal/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.008.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fd6a3cb641e6d7b3244e48c1635a3386
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.9.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.9.0
deleted file mode 100644
index 37cdaf4c48e0..000000000000
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Try-Tiny-0.70.0 >=virtual/perl-ExtUtils-MakeMaker-6.30 test? ( virtual/perl-Test-Simple ) dev-lang/perl[-build]
-DESCRIPTION=Incredibly simple helpers for testing code with exceptions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Test-Fatal/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Try-Tiny-0.70.0 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.009.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fe4489fa652b831374f035e92c859325
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.66 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.66
deleted file mode 100644
index 0627cfe1f23d..000000000000
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.66
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle ) dev-lang/perl[-build]
-DESCRIPTION=Handy web browsing in a Perl object
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize/
-IUSE=test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/WWW-Mechanize-1.66.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e32c3329862ebd6561080a38f4e17048
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.700.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.700.0
deleted file mode 100644
index 4254e57ab440..000000000000
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.700.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle dev-perl/HTTP-Server-Simple ) dev-lang/perl[-build]
-DESCRIPTION=Handy web browsing in a Perl object
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/Test-LongString dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.70.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=059d817c972a149c9992dec02a8f01c2
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.710.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.710.0
deleted file mode 100644
index ac7361934c9f..000000000000
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.710.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree test? ( dev-perl/PadWalker dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception dev-perl/Test-NoWarnings dev-perl/Test-Taint >=dev-perl/Test-Warn-0.11 dev-perl/Test-Memory-Cycle dev-perl/HTTP-Server-Simple ) dev-lang/perl[-build]
-DESCRIPTION=Handy web browsing in a Perl object
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/WWW-Mechanize/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/IO-Socket-SSL || ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6 ) >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.71.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2892184584dc6240843d8afc2b021f13
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.36-r1 b/metadata/md5-cache/dev-perl/XML-Parser-2.36-r1
deleted file mode 100644
index 2c3b37120510..000000000000
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.36-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl
-DESCRIPTION=A Perl extension interface to James Clark's XML parser, expat
-HOMEPAGE=http://search.cpan.org/dist/XML-Parser/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=07c4b761dda3793df32d23eefbbebc69
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.223 b/metadata/md5-cache/dev-perl/glib-perl-1.223
deleted file mode 100644
index 61b858beb8f6..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.223
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=3
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Glib-1.223.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2c37b2ab7644a236087481fdbef29fa3
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.224.0 b/metadata/md5-cache/dev-perl/glib-perl-1.224.0
deleted file mode 100644
index e5ecff4df59c..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.224.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=4
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Glib-1.224.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0e362734e1bb02dfb0014830da5a2693
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.240.0 b/metadata/md5-cache/dev-perl/glib-perl-1.240.0
deleted file mode 100644
index 4b36385bded0..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.240.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=4
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Glib-1.240.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=715911ec3d6f7839b86fddb40fe102e6
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.241.0 b/metadata/md5-cache/dev-perl/glib-perl-1.241.0
deleted file mode 100644
index 4ab2ea738c1e..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.241.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=4
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.241.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8eeead4a68b55703df5421629681490d
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.250.0 b/metadata/md5-cache/dev-perl/glib-perl-1.250.0
deleted file mode 100644
index 1e9e23b16975..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.250.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=4
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.250.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d39d226958d42ab957ec169f17487bf2
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.251.0 b/metadata/md5-cache/dev-perl/glib-perl-1.251.0
deleted file mode 100644
index ef6ee4f3199f..000000000000
--- a/metadata/md5-cache/dev-perl/glib-perl-1.251.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0 >=dev-perl/extutils-depends-0.300 dev-lang/perl[-build]
-DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
-EAPI=4
-HOMEPAGE=http://gtk2-perl.sf.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.251.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b89878e7b87cf6c24a13494cdf00899b
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.16 b/metadata/md5-cache/dev-perl/libintl-perl-1.16
deleted file mode 100644
index 3d921998ca25..000000000000
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-lang/perl
-DESCRIPTION=Perl internationalization library that aims to be compatible with the Uniforum message translations system
-HOMEPAGE=http://search.cpan.org/~guido/
-KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.16.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f66860e2cd41c4feed96c0f73fd641b9
diff --git a/metadata/md5-cache/dev-perl/mime-construct-1.900.0 b/metadata/md5-cache/dev-perl/mime-construct-1.900.0
index 85036ca14b28..e9cc39988c45 100644
--- a/metadata/md5-cache/dev-perl/mime-construct-1.900.0
+++ b/metadata/md5-cache/dev-perl/mime-construct-1.900.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl[-build]
 DESCRIPTION=construct and optionally mail MIME messages
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/mime-construct/
-KEYWORDS=amd64 ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 ia64 ppc ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.9.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ca6a624ae712c3670edced28c21c10d2
+_md5_=ffc96b60aaf310762f55caeeb88bb597
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.37 b/metadata/md5-cache/dev-perl/mogilefs-server-2.37
index 991ddf54125c..a1e9d928dadc 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.37
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.37
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/mogilefs-server-2.37.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=53a2658cd0e8b7aab427b42294f18010
+_md5_=0e58931ec481e23f8134d54d09c8ae0d
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.43 b/metadata/md5-cache/dev-perl/mogilefs-server-2.43
index 66e26e5e0174..011adcf04b6f 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.43
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.43
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.43.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e5a20c06c053d2942fbb5f3fb38f582d
+_md5_=40e48c51f9ac04ff08b9fca563c44063
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.46 b/metadata/md5-cache/dev-perl/mogilefs-server-2.46
index d8bc17609b31..46b6540fe0a5 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.46
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.46
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.46.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b5c6552b743eff0b6a8875b5e82df227
+_md5_=6f9bb5e4f63ba33f67c9bdddb61dc2c5
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.50 b/metadata/md5-cache/dev-perl/mogilefs-server-2.50
index a12a30f5488f..c60abd992882 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.50
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.50
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.50.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0032897ea16a963721090c05a7a9e8f5
+_md5_=12fda7d63cf1853256b31899f7c5620e
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.51 b/metadata/md5-cache/dev-perl/mogilefs-server-2.51
index f52e48f99f13..0f26a36059e0 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.51
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.51
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.51.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fb4b1197cd61a6400c005ddc6174e31e
+_md5_=f1c48547063f9216e3c062dba257f18c
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.53 b/metadata/md5-cache/dev-perl/mogilefs-server-2.53
index b6925a7efbfe..c795045c9345 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.53
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.53
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.53.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f7f7b94908040d0a085b4cd36aefa01c
+_md5_=4656a70402d42f5e49953e7f51dd4c06
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.530.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.530.0
index 4d2ef0e42f57..9b1dfedee2b1 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.530.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.530.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.53.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=cd9834b0daf56346306e29a38622b533
+_md5_=743f57d3a54822fdd3d02f5c1f860710
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.540.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.540.0
index 6c5371d67c37..ccfd620311b9 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.540.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.540.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.54.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d64ac343396db28408bdf331f60b3595
+_md5_=2bff527e80108903324e7612683b8b1d
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.550.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.550.0
index 00b3fe61f99e..f1697e6cbce7 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.550.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.550.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.55.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=88c4c38ae823fc63e0ddb0cd6091fd1c
+_md5_=0cf9d366df8693a7eabbb85ee7ef0e83
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.560.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.560.0
index 7193a5e4c43d..acb0fa5eeb0d 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.560.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.560.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.56.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=77a82231e49ce3430201aa3ca60389f5
+_md5_=6edd41b7f5da8e2e03e19f9efcdabd76
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.570.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.570.0
index d99e57b291fb..9797e37b03c7 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.570.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.570.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.57.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=db8bc9a797d2fb4fe5bad716f720d6f7
+_md5_=688127df5e9ab04208070ff69f283e05
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.580.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.580.0
index c3dd94b2cb06..44081c17695e 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.580.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.580.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.58.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6efe77a9b9ba8f5eac549836ad8de3ba
+_md5_=7bda7111f2a6b1c5fb7a7e659b52f93b
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.590.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.590.0
index c9026af94e3c..6bf3f94df4cf 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.590.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.590.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.59.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=509c1d9d1102fdbc1a7baf6dc25ef3c8
+_md5_=e364be6340a1044130ee9a6f5db181b6
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.600.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.600.0
index de6f95257194..5ce4e9db9cd2 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.600.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.600.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.60.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=223e605e735202ab52c358ca772ce6c8
+_md5_=ca031768434ffebe6e17f38c4df0b451
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.610.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.610.0
index f7b30d43161b..88a5c2986413 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.610.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.610.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.61.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=73648319588c9a722b6c2be21925c6ae
+_md5_=c62bb9f5c55090ab77a705088cf10c15
diff --git a/metadata/md5-cache/dev-perl/mogilefs-server-2.620.0 b/metadata/md5-cache/dev-perl/mogilefs-server-2.620.0
index 91bacd52fc8e..2807b8cca97b 100644
--- a/metadata/md5-cache/dev-perl/mogilefs-server-2.620.0
+++ b/metadata/md5-cache/dev-perl/mogilefs-server-2.620.0
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.62.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=09befb869f0bfbf5f9727e90526d8dd8
+_md5_=3a9ccbc0396cc5dd08e9b96209508d53
diff --git a/metadata/md5-cache/dev-perl/regexp-common-2010010201 b/metadata/md5-cache/dev-perl/regexp-common-2010010201
deleted file mode 100644
index fe56fd53f02c..000000000000
--- a/metadata/md5-cache/dev-perl/regexp-common-2010010201
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Provide commonly requested regular expressions
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Regexp-Common/
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic Artistic-2 MIT BSD )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2010010201.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f4e7a1d318d1373b2fe6c2c52e570757
diff --git a/metadata/md5-cache/dev-perl/regexp-common-2011041701.0.0 b/metadata/md5-cache/dev-perl/regexp-common-2011041701.0.0
deleted file mode 100644
index 3b0ef4416c57..000000000000
--- a/metadata/md5-cache/dev-perl/regexp-common-2011041701.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl[-build]
-DESCRIPTION=Provide commonly requested regular expressions
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Regexp-Common/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic Artistic-2 MIT BSD )
-RDEPEND=dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2011041701.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f4b614e050476125fa28a1be6b144e32
diff --git a/metadata/md5-cache/dev-python/numpy-1.6.1-r1 b/metadata/md5-cache/dev-python/numpy-1.6.1-r1
index e50497e1b862..b75ceb039546 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=3
 HOMEPAGE=http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy
 IUSE=doc lapack test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools lapack? ( virtual/cblas virtual/lapack virtual/fortran ) dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/numpy/numpy-1.6.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.6.0/numpy-html.zip -> numpy-1.6.0-html.zip http://docs.scipy.org/doc/numpy-1.6.0/numpy-ref.pdf -> numpy-1.6.0-ref.pdf http://docs.scipy.org/doc/numpy-1.6.0/numpy-user.pdf -> numpy-1.6.0-user.pdf )
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fc307de487614b9ed04da6ce9e970349
+_md5_=ef2961b9683ec5adad9e650f437f7af2
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.1.3 b/metadata/md5-cache/dev-python/oauthlib-0.1.3
index 3fadda918c92..a56c321f826f 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.1.3
+++ b/metadata/md5-cache/dev-python/oauthlib-0.1.3
@@ -10,4 +10,4 @@ RDEPEND=dev-python/rsa || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.1.3.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=cbc282e2afacb32742a61b0c884f11f8
+_md5_=8b601920be4117acd63c2206f8efb030
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6 b/metadata/md5-cache/dev-python/pycrypto-2.6
index 9415c5458764..c6ec96af6072 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6
@@ -4,10 +4,10 @@ DESCRIPTION=Python Cryptography Toolkit
 EAPI=4
 HOMEPAGE=http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto
 IUSE=doc +gmp
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=PSF-2 public-domain
 RDEPEND=gmp? ( dev-libs/gmp ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=eb8e97e7cc6c6e48e014f11f3ae9f2f4
+_md5_=63ee3323a29f72341ba0eb8ad0fdb067
diff --git a/metadata/md5-cache/dev-python/pyside-1.1.1 b/metadata/md5-cache/dev-python/pyside-1.1.1
index bee2c0665eae..8c77b3f724f1 100644
--- a/metadata/md5-cache/dev-python/pyside-1.1.1
+++ b/metadata/md5-cache/dev-python/pyside-1.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phon
 SLOT=0
 SRC_URI=http://www.pyside.org/files/pyside-qt4.8+1.1.1.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=a8a8e77059746a237460d4ae199f63e4
+_md5_=64f1b25ff9cbd46e8f6d86f850e28f00
diff --git a/metadata/md5-cache/dev-python/pytz-2012c b/metadata/md5-cache/dev-python/pytz-2012c
index 509479fa17eb..85b49ddbbf25 100644
--- a/metadata/md5-cache/dev-python/pytz-2012c
+++ b/metadata/md5-cache/dev-python/pytz-2012c
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools >=sys-libs/timezone-data-2012c dev-lang/python
 DESCRIPTION=World timezone definitions for Python
 EAPI=3
 HOMEPAGE=http://pypi.python.org/pypi/pytz http://pytz.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools >=sys-libs/timezone-data-2012c dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2012c.tar.bz2
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3f3bc1677e9f337e22024e581be9eaec
+_md5_=165692d16d87c459be355b40477401fd
diff --git a/metadata/md5-cache/dev-ruby/kramdown-0.13.7 b/metadata/md5-cache/dev-ruby/kramdown-0.13.7
new file mode 100644
index 000000000000..78e0f07fd564
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/kramdown-0.13.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition.
+EAPI=4
+HOMEPAGE=http://kramdown.rubyforge.org/
+IUSE=latex elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/kramdown-0.13.7.gem
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3b7dcfcfd6fbcffb9d4083a5dab39b45
diff --git a/metadata/md5-cache/dev-ruby/weakling-0.0.3-r1 b/metadata/md5-cache/dev-ruby/weakling-0.0.3-r1
index f1c646985b90..011013f25982 100644
--- a/metadata/md5-cache/dev-ruby/weakling-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/weakling-0.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/bytelist dev-java/jruby >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/weakling-0.0.3.gem
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-pkg-simple	d7cef87260947d4cce245c4f026377e2	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f92b5841d85152326babf9ecde183560
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2 b/metadata/md5-cache/dev-scheme/jscheme-7.2
index d496bed761c7..5d0158fa1f57 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=952d3c15add7ba2fbf02732068991767
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.10 b/metadata/md5-cache/dev-scheme/kawa-1.10
index 39d389e0cad1..c2befde25806 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dad2a87d77a3950e1272170b845de5d3
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.9.1 b/metadata/md5-cache/dev-scheme/kawa-1.9.1
index cceec64ff387..fda018d3254f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 de661ec904b4..b1adc1cb20f6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93db3669b400d66f0badfef77bba5882
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0
index 521b783188a9..9276526b8cc1 100644
--- a/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0
+++ b/metadata/md5-cache/dev-tcltk/expect-lite-4.3.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=quick and easy command line automation tool built on top of expect
 HOMEPAGE=http://expect-lite.sourceforge.net/
 IUSE=debug examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
 SLOT=0
 SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.3.0.tar.gz
-_md5_=cef5c5416bd4bb05a3feb68f4a2338ae
+_md5_=e76c3fbd16e9150d3b1776159cad493b
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1i b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1i
index 7216e382a9f0..3edbd06090ef 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1i
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1i
@@ -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.1i.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	latex-package	e7bfe03b27224512702eac009812cc50	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	latex-package	e7bfe03b27224512702eac009812cc50	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fc6d1dbe74b9be39b966a61a40ae4833
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1k b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1k
index c0588d05a7cf..4ed5cf1d7c40 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1k
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1k
@@ -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.1k.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	latex-package	e7bfe03b27224512702eac009812cc50	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	latex-package	e7bfe03b27224512702eac009812cc50	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45024fad3a2f443476921f18439ab541
diff --git a/metadata/md5-cache/dev-util/antlrworks-1.2.3 b/metadata/md5-cache/dev-util/antlrworks-1.2.3
index 54dfa1a85a64..d82df88c7580 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=acc32c119285c0636f7e01c027330399
diff --git a/metadata/md5-cache/dev-util/argouml-0.29.2 b/metadata/md5-cache/dev-util/argouml-0.29.2
index 9a1d831378d6..21f818180d7a 100644
--- a/metadata/md5-cache/dev-util/argouml-0.29.2
+++ b/metadata/md5-cache/dev-util/argouml-0.29.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.29.2/ArgoUML-0.29.2.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.29.2/manual-0.29.2.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.29.2/quickguide-0.29.2.pdf )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4cd89148af8f58d243943625977eefed
diff --git a/metadata/md5-cache/dev-util/argouml-0.32.2 b/metadata/md5-cache/dev-util/argouml-0.32.2
index a95796aacbe7..c35c3682e788 100644
--- a/metadata/md5-cache/dev-util/argouml-0.32.2
+++ b/metadata/md5-cache/dev-util/argouml-0.32.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.32.2/ArgoUML-0.32.2.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.32.2/manual-0.32.2.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.32.2/quickguide-0.32.2.pdf )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=060bc46d8aa9ade2b152777034627151
diff --git a/metadata/md5-cache/dev-util/argouml-0.34 b/metadata/md5-cache/dev-util/argouml-0.34
index d4171fa7270f..bf22f4e0a4e6 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	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ffac973de0a65466a64031fb37ddfbed
diff --git a/metadata/md5-cache/dev-util/boost-build-1.48.0-r1 b/metadata/md5-cache/dev-util/boost-build-1.48.0-r1
index 5a006e782a9f..a244024e08ac 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.48.0-r1
+++ b/metadata/md5-cache/dev-util/boost-build-1.48.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A system for large project software construction, which is simple to
 EAPI=4
 HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
 IUSE=examples python
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Boost-1.0
 RDEPEND=!<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 python? ( dev-lang/python )
 SLOT=1.48
 SRC_URI=mirror://sourceforge/boost/boost_1_48_0.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4466413e0b293698f430f9ffed9c769e
+_md5_=80b3cd72299a8b146cdbde0467fca3c1
diff --git a/metadata/md5-cache/dev-util/ccache-3.1.7 b/metadata/md5-cache/dev-util/ccache-3.1.7
index f7530f8312eb..215eb4a4427a 100644
--- a/metadata/md5-cache/dev-util/ccache-3.1.7
+++ b/metadata/md5-cache/dev-util/ccache-3.1.7
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst unpack
 DEPEND=sys-libs/zlib
 DESCRIPTION=fast compiler cache
 HOMEPAGE=http://ccache.samba.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=9067f559727ff0bdee22b283a0e162e3
+_md5_=8a4eb8f2eac155446999487f9f2a1216
diff --git a/metadata/md5-cache/dev-util/checkstyle-4.4 b/metadata/md5-cache/dev-util/checkstyle-4.4
index 3f4670abac42..ddcadd62cba0 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=40c5665fcea5b0efc345b59a49c597d9
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.4 b/metadata/md5-cache/dev-util/checkstyle-5.4
index f0bce0db6763..0903cb713ecf 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=563f8b3a63b6983bec353e1a67e0d76a
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.5 b/metadata/md5-cache/dev-util/checkstyle-5.5
index f50add2f5c46..6a617ed58a2d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eacb4b48e8a412c51cab281d9c779e4e
diff --git a/metadata/md5-cache/dev-util/deskzilla-1.6.1 b/metadata/md5-cache/dev-util/deskzilla-1.6.1
index c65ab1a0102d..63f740631ca0 100644
--- a/metadata/md5-cache/dev-util/deskzilla-1.6.1
+++ b/metadata/md5-cache/dev-util/deskzilla-1.6.1
@@ -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_6_1_without_jre.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccd8758c72b4aa9f640a368af5f16cb5
diff --git a/metadata/md5-cache/dev-util/deskzilla-1.7.1 b/metadata/md5-cache/dev-util/deskzilla-1.7.1
index 95a737026322..2d12c7237c8a 100644
--- a/metadata/md5-cache/dev-util/deskzilla-1.7.1
+++ b/metadata/md5-cache/dev-util/deskzilla-1.7.1
@@ -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
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9546e91ca1dcf764555d7a15eccff05c
diff --git a/metadata/md5-cache/dev-util/eclipse-sdk-3.4-r2 b/metadata/md5-cache/dev-util/eclipse-sdk-3.4-r2
index 46396df8a4e5..f2642de5b292 100644
--- a/metadata/md5-cache/dev-util/eclipse-sdk-3.4-r2
+++ b/metadata/md5-cache/dev-util/eclipse-sdk-3.4-r2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-eclipse-ecj:3.4 dev-java/ant-core dev-java/ant-nodeps dev-java/junit:0 dev-java/junit:4 dev-java/swt:3.4 >=dev-java/jsch-0.1.36-r1 >=dev-java/icu4j-3.8.1:0 >=dev-java/commons-el-1.0-r2 >=dev-java/commons-logging-1.1-r6 >=dev-java/tomcat-servlet-api-5.5.25-r1:2.4 dev-java/lucene:1.9 >=dev-java/lucene-analyzers-1.9.1-r1:1.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=3.4
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-sourceBuild-srcIncluded-3.4.zip
-_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=868a660e2e71baf9f0d1de37fa58a350
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 c59da1976869..f58bbd35c763 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	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e4adbc3cef415638dbdb7bc4841b6bf
diff --git a/metadata/md5-cache/dev-util/eric-4.5.0 b/metadata/md5-cache/dev-util/eric-4.5.0
deleted file mode 100644
index b2b81db12793..000000000000
--- a/metadata/md5-cache/dev-util/eric-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
-EAPI=4
-HOMEPAGE=http://eric-ide.python-projects.org/
-IUSE=kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-PDEPEND=spell? ( dev-python/pyenchant )
-RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=4
-SRC_URI=mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-4.5.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-cs-4.5.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-de-4.5.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-en-4.5.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-es-4.5.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-fr-4.5.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-it-4.5.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-ru-4.5.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-tr-4.5.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f0ac1c5d45b616283b16b220baa66a9c
diff --git a/metadata/md5-cache/dev-util/eric-4.5.3 b/metadata/md5-cache/dev-util/eric-4.5.3
index cd55ef706db7..bea7a648cb8e 100644
--- a/metadata/md5-cache/dev-util/eric-4.5.3
+++ b/metadata/md5-cache/dev-util/eric-4.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
 EAPI=4
 HOMEPAGE=http://eric-ide.python-projects.org/
 IUSE=kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 PDEPEND=spell? ( dev-python/pyenchant )
 RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-4.5.3.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-cs-4.5.3.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-de-4.5.3.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-en-4.5.3.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-es-4.5.3.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-fr-4.5.3.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-it-4.5.3.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-ru-4.5.3.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-tr-4.5.3.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.3/eric4-i18n-zh_CN.GB2312-4.5.3.tar.gz )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4d78033ceba2c7e25b3aa55bc5b2ee70
+_md5_=66d9904e3c1e538b7f2fa4048c797b0c
diff --git a/metadata/md5-cache/dev-util/eric-5.2.0 b/metadata/md5-cache/dev-util/eric-5.2.0
deleted file mode 100644
index df83086ebcdf..000000000000
--- a/metadata/md5-cache/dev-util/eric-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
-DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
-EAPI=4
-HOMEPAGE=http://eric-ide.python-projects.org/
-IUSE=spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-PDEPEND=spell? ( dev-python/pyenchant )
-RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
-SLOT=5
-SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-5.2.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-cs-5.2.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-de-5.2.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-en-5.2.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-es-5.2.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-fr-5.2.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-it-5.2.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-ru-5.2.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-tr-5.2.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a87f17945f8f92331f6486194daa6c53
diff --git a/metadata/md5-cache/dev-util/eric-5.2.2 b/metadata/md5-cache/dev-util/eric-5.2.2
index 0f0c21653fc0..1f654b36d68e 100644
--- a/metadata/md5-cache/dev-util/eric-5.2.2
+++ b/metadata/md5-cache/dev-util/eric-5.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
 EAPI=4
 HOMEPAGE=http://eric-ide.python-projects.org/
 IUSE=spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 PDEPEND=spell? ( dev-python/pyenchant )
 RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
 SLOT=5
 SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-5.2.2.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-cs-5.2.2.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-de-5.2.2.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-en-5.2.2.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-es-5.2.2.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-fr-5.2.2.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-it-5.2.2.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-ru-5.2.2.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-tr-5.2.2.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.2/eric5-i18n-zh_CN.GB2312-5.2.2.tar.gz )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d1360a201e0afb58c47a3dd9bb2b97fa
+_md5_=c8e6b1f5262cf49fcd186e82fa60968a
diff --git a/metadata/md5-cache/dev-util/findbugs-1.3.9 b/metadata/md5-cache/dev-util/findbugs-1.3.9
index 95817edfc1c0..9038285eb044 100644
--- a/metadata/md5-cache/dev-util/findbugs-1.3.9
+++ b/metadata/md5-cache/dev-util/findbugs-1.3.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/icu4j:0 dev-java/ant-core dev-java/commons-lang:2.1 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-3.1:3 dev-java/dom4j dev-java/bcel[findbugs] dev-java/jsr305 dev-java/jformatstring =dev-java/jaxen-1.1* =dev-java/jdepend-2.9* doc? ( =dev-java/saxon-6.5* app-text/docbook-xsl-stylesheets ) dev-java/ant-junit =dev-java/junit-4* >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-1.3.9-source.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b0fbe9335a6a601267a59c90dc428559
diff --git a/metadata/md5-cache/dev-util/jarwizard-2.50 b/metadata/md5-cache/dev-util/jarwizard-2.50
index 45695cca3b1c..a6c9836f32a3 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=742b241302bbca56a64cadb2e7afcf20
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r2 b/metadata/md5-cache/dev-util/jconfig-2.8-r2
index 9ff2386390a5..ae2407ecae52 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=884aa8884c935f95a6164644ab3724ab
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
index 65955dc4a555..c20cbc849751 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f03b095410f2ce88b367d6119f66fe1d
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8.5 b/metadata/md5-cache/dev-util/jconfig-2.8.5
index 568aff5919d9..f1cc66b3a0d5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41c7d55a0e2139b98a0576a9d51b3b22
diff --git a/metadata/md5-cache/dev-util/jif-3.1_rc1 b/metadata/md5-cache/dev-util/jif-3.1_rc1
index c7ed1782db5e..80d181b62a75 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dacba14bcf788ace0cf2b03cf13c6b01
diff --git a/metadata/md5-cache/dev-util/netbeans-6.8-r1 b/metadata/md5-cache/dev-util/netbeans-6.8-r1
index 86765a577962..664a9ad17f30 100644
--- a/metadata/md5-cache/dev-util/netbeans-6.8-r1
+++ b/metadata/md5-cache/dev-util/netbeans-6.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.5 java-virtuals/jdk-with-com-sun >=dev-java/javahelp-2:0 dev-java/jna:0 dev-java/jsr223:0 >=dev-java/swing-layout-1:1 netbeans_modules_enterprise? ( >=dev-java/antlr-2.7.7:0[java] >=dev-java/asm-3.1: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-fileupload-1:0 >=dev-java/commons-io-1.1:1 >=dev-java/commons-logging-1.1:0 >=dev-java/commons-validator-1.3:0 dev-java/glassfish-deployment-api:1.2 >=dev-java/httpunit-1.6:0 dev-java/jakarta-jstl:0 >=dev-java/jakarta-oro-2:2.0 >=dev-java/jettison-1.0:0 dev-java/jsr311-api:0 ) netbeans_modules_harness? ( dev-java/asm:2.2 >=dev-java/jakarta-oro-2:2.0 >=dev-java/log4j-1.2:0 ) netbeans_modules_ide? ( >=dev-java/commons-codec-1.3:0 >=dev-java/commons-httpclient-3.1:3 >=dev-java/commons-io-1.1:1 >=dev-java/commons-lang-2.3:2.1 >=dev-java/commons-logging-1.1:0 >=dev-java/commons-net-1.4:0 >=dev-java/flute-1.3:0 >=dev-java/freemarker-2.3.8:2.3 >=dev-java/jakarta-oro-2:2.0 >=dev-java/jdbc-mysql-5.1:0 >=dev-java/jdbc-postgresql-8.3_p603:0 >=dev-java/jsch-0.1.39:0 >=dev-java/jzlib-1.0.7:0 dev-java/jsr173:0 >=dev-java/jvyamlb-0.2.3:0 dev-java/lucene:2.4 >=dev-java/sac-1.3:0 dev-java/sun-jaf:0 ~dev-java/tomcat-servlet-api-3:2.2 >=dev-java/xerces-2.8.1:2 >=dev-vcs/subversion-1.6:0[java] ) netbeans_modules_java? ( >=dev-java/ant-1.7:0 >=dev-java/antlr-2.7.7:0[java] >=dev-java/appframework-1.03:0 dev-java/asm:2.2 >=dev-java/beansbinding-1.2.1:0 >=dev-java/cglib-2.2_beta:2.2 dev-java/commons-collections:0 >=dev-java/dom4j-1.6:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/glassfish-persistence:0 dev-java/glassfish-transaction-api:0 dev-java/hibernate:3.1 dev-java/javassist:3 >=dev-java/jdom-1.0:1.0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/jsr67:0 dev-java/jtidy:0 >=dev-java/junit-3.8.2:0 dev-java/saaj:0 dev-java/stax-ex:0 >=dev-java/swing-worker-1.1:0 dev-java/xmlstreambuffer:0 ) netbeans_modules_mobility? ( >=dev-java/ant-contrib-1.0_beta:0 >=dev-java/commons-codec-1.3:0 dev-java/commons-httpclient:3 dev-java/jakarta-slide-webdavclient:0 dev-java/jdom:1.0 >=dev-java/proguard-4.2:0 ) netbeans_modules_php? ( >=dev-java/javacup-0.11a_beta20060608:0 ) netbeans_modules_ruby? ( dev-java/asm:3 dev-java/jline:0 dev-java/jna-posix:0 dev-java/joda-time:0 dev-java/joni:0 dev-java/jruby:0 dev-util/jay:0[java] ) >=dev-java/java-config-2.1.9-r1
 SLOT=6.8
 SRC_URI=http://download.netbeans.org/netbeans/6.8/final/zip/netbeans-6.8-200912041610-src.zip mirror://gentoo/netbeans-6.8-l10n-20091209164706.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c661ead6dcf91fed7f206b69f4f0f9ea
diff --git a/metadata/md5-cache/dev-util/netbeans-7.0.1-r2 b/metadata/md5-cache/dev-util/netbeans-7.0.1-r2
index 2f262003ca3e..ed007dc7593a 100644
--- a/metadata/md5-cache/dev-util/netbeans-7.0.1-r2
+++ b/metadata/md5-cache/dev-util/netbeans-7.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-nb-7.0.1 ~dev-java/netbeans-platform-7.0.1 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.0.1 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.0.1 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.0.1 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.0.1 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.0.1 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.0.1 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.0.1 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.0.1 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.0.1 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.0.1 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.0.1 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.0.1 ) doc? ( ~dev-java/netbeans-javadoc-7.0.1 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.0
 SRC_URI=linguas_af? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ar? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ca? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_cs? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_de? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_el? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_es? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_fr? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_gl? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_hi_IN? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_id? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_it? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ja? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ko? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_lt? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_nl? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_pl? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_pt_BR? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_pt_PT? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ro? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_ru? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_sq? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_sr? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_sv? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_tl? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_tr? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_vi? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_zh_CN? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 ) linguas_zh_TW? ( http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0.1-20110930.tar.bz2 )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df4a94d11006bfbadfb59e6b360bb2ed
diff --git a/metadata/md5-cache/dev-util/netbeans-7.1.1 b/metadata/md5-cache/dev-util/netbeans-7.1.1
index df18a1d03c70..5f500b9112fe 100644
--- a/metadata/md5-cache/dev-util/netbeans-7.1.1
+++ b/metadata/md5-cache/dev-util/netbeans-7.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.1 ~dev-java/netbeans-ide-7.1.1 ~dev-java/netbeans-nb-7.1.1 ~dev-java/netbeans-platform-7.1.1 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.1.1 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.1.1 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.1.1 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.1.1 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.1.1 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.1.1 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.1.1 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.1.1 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.1.1 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.1.1 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.1.1 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.1.1 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.1.1 ) doc? ( ~dev-java/netbeans-javadoc-7.1.1 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ar? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_bg? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ca? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_cs? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_de? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_el? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_es? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_fr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_gl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_hi_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_id? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_it? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ja? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ko? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_lt? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_nl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_BR? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_PT? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ro? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ru? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_si? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sq? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sv? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ta_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_vi? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_CN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_TW? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3faf1433cff955ddd98df700ed589cb
diff --git a/metadata/md5-cache/dev-util/netbeans-7.1.2 b/metadata/md5-cache/dev-util/netbeans-7.1.2
index d34225f160b8..200dbc44e590 100644
--- a/metadata/md5-cache/dev-util/netbeans-7.1.2
+++ b/metadata/md5-cache/dev-util/netbeans-7.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.1.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.1.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.1.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.1.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.1.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.1.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.1.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.1.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.1.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.1.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.1.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.1.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.1.2 ) doc? ( ~dev-java/netbeans-javadoc-7.1.2 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ar? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_bg? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ca? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_cs? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_de? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_el? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_es? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_fr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_gl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_hi_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_id? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_it? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ja? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ko? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_lt? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_nl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_BR? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_PT? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ro? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ru? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_si? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sq? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sv? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ta_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_vi? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_CN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_TW? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3aaf7ebab1cc976c6d6e59b3ee5946a9
diff --git a/metadata/md5-cache/dev-util/pmd-4.2.5 b/metadata/md5-cache/dev-util/pmd-4.2.5
index a9cf41544668..3943f3493f56 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=281410960c1efcdfa844aa8cd635c6d5
diff --git a/metadata/md5-cache/dev-util/weka-3.5.7 b/metadata/md5-cache/dev-util/weka-3.5.7
index 67561e1e35d0..719fa106895f 100644
--- a/metadata/md5-cache/dev-util/weka-3.5.7
+++ b/metadata/md5-cache/dev-util/weka-3.5.7
@@ -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://sourceforge/weka/weka-3-5-7.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=433964abe0eaee082f56a0f07f16e28d
diff --git a/metadata/md5-cache/dev-util/weka-3.5.8 b/metadata/md5-cache/dev-util/weka-3.5.8
index 62f40733a315..30aff2db0323 100644
--- a/metadata/md5-cache/dev-util/weka-3.5.8
+++ b/metadata/md5-cache/dev-util/weka-3.5.8
@@ -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://sourceforge/weka/weka-3-5-8.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf7ca55bb33c3a2c3cb87785160fb0b5
diff --git a/metadata/md5-cache/dev-util/weka-3.6.0 b/metadata/md5-cache/dev-util/weka-3.6.0
index 918a94c42954..32ebd1cd01c5 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.0
+++ b/metadata/md5-cache/dev-util/weka-3.6.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/weka/weka-3-6-0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a1c295c003b70bc691aa5e68a9597fdd
diff --git a/metadata/md5-cache/dev-util/weka-3.6.2 b/metadata/md5-cache/dev-util/weka-3.6.2
index 812b069f0bda..b2dc73fe0e95 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.2
+++ b/metadata/md5-cache/dev-util/weka-3.6.2
@@ -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-2.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9e773b940c51baa77aa64e665e0ba00e
diff --git a/metadata/md5-cache/dev-util/weka-3.6.4 b/metadata/md5-cache/dev-util/weka-3.6.4
index 929ea2c9e4c7..c1f13dad7182 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.4
+++ b/metadata/md5-cache/dev-util/weka-3.6.4
@@ -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-4.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d396aecfd4b53613caeb8e27758311f
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 8cc7f26c9b09..5dd3c8f91a64 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1fe1cd9775ceef63c4d8eb7dd251ba4b
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.4.0 b/metadata/md5-cache/dev-vcs/statcvs-0.4.0
index 94176821596c..a2a5994bd897 100644
--- a/metadata/md5-cache/dev-vcs/statcvs-0.4.0
+++ b/metadata/md5-cache/dev-vcs/statcvs-0.4.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 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://sourceforge/statcvs/statcvs-0.4.0-source.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43bfa0cca62eee9a5b7582a10fc66bb7
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.4.0-r1 b/metadata/md5-cache/dev-vcs/statcvs-0.4.0-r1
index 1aeef22cf71f..bb928da68c39 100644
--- a/metadata/md5-cache/dev-vcs/statcvs-0.4.0-r1
+++ b/metadata/md5-cache/dev-vcs/statcvs-0.4.0-r1
@@ -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 dev-java/jdom:1.0 dev-java/ant-core: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://sourceforge/statcvs/statcvs-0.4.0-source.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0f919c08b9134df92fb9a880df8fcee
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.5.0 b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
index 8c0508d6a1d7..7e1178c0eb91 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97ec4ec1382cf549c88320df700d8978
diff --git a/metadata/md5-cache/dev-vcs/statsvn-0.4.1 b/metadata/md5-cache/dev-vcs/statsvn-0.4.1
index c5cc4b567642..58bcce5c6683 100644
--- a/metadata/md5-cache/dev-vcs/statsvn-0.4.1
+++ b/metadata/md5-cache/dev-vcs/statsvn-0.4.1
@@ -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.3:0 >=dev-java/backport-util-concurrent-3.0: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://sourceforge/statsvn/statsvn-0.4.1-source.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9862f1289061562004ec367838e0bb2f
diff --git a/metadata/md5-cache/dev-vcs/statsvn-0.5.0 b/metadata/md5-cache/dev-vcs/statsvn-0.5.0
index f9fead8429ee..d550e720fe98 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b8e947368180c4f7eea2987f8ffdd979
diff --git a/metadata/md5-cache/games-board/jrisk-1.0.9.3 b/metadata/md5-cache/games-board/jrisk-1.0.9.3
index c6593ae45731..638448d49202 100644
--- a/metadata/md5-cache/games-board/jrisk-1.0.9.3
+++ b/metadata/md5-cache/games-board/jrisk-1.0.9.3
@@ -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://sourceforge/jrisk/backup_of_Risk_1.0.9.3.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=43b64f679b801c5d9da3b8a0f19d5d2f
diff --git a/metadata/md5-cache/games-board/jrisk-1.0.9.8 b/metadata/md5-cache/games-board/jrisk-1.0.9.8
index 16b1ee079723..52e42eddbee2 100644
--- a/metadata/md5-cache/games-board/jrisk-1.0.9.8
+++ b/metadata/md5-cache/games-board/jrisk-1.0.9.8
@@ -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://sourceforge/jrisk/backup_of_Risk_1.0.9.8.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=832158781ec5ac9c873b34a00833eecb
diff --git a/metadata/md5-cache/games-board/megamek-0.34.9 b/metadata/md5-cache/games-board/megamek-0.34.9
index eb2e7d1ef3cb..5339fe65a271 100644
--- a/metadata/md5-cache/games-board/megamek-0.34.9
+++ b/metadata/md5-cache/games-board/megamek-0.34.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/megamek/MegaMek-v0.34.9.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8be595bcca0ac55b293de039efb58d0
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
index 05546216df12..7aa0169812b5 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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f99bd5e4e98a01bcd8728bcc53a96027
diff --git a/metadata/md5-cache/games-strategy/freecol-0.10.5 b/metadata/md5-cache/games-strategy/freecol-0.10.5
index d913702322e8..3c8aa79ed4cf 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.10.5
+++ b/metadata/md5-cache/games-strategy/freecol-0.10.5
@@ -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
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.10.5-src.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4bacfa655324105078a0259ef1859c8b
diff --git a/metadata/md5-cache/games-strategy/freecol-0.8.4 b/metadata/md5-cache/games-strategy/freecol-0.8.4
index 60281865285f..af43047c9452 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.8.4
+++ b/metadata/md5-cache/games-strategy/freecol-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/higlayout >=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.8.4-src.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5e561ae620964f887cfbb13b6646b75
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 efc3855e18bf..071b209af4b1 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 >=dev-java/java-config-2.1.9-r1
 RESTRICT=mirror 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	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59430a11af1190969fb3e33bcd8499bd
diff --git a/metadata/md5-cache/games-strategy/triplea-0.9.0.2-r1 b/metadata/md5-cache/games-strategy/triplea-0.9.0.2-r1
index a25fad024d9f..49a7293f2949 100644
--- a/metadata/md5-cache/games-strategy/triplea-0.9.0.2-r1
+++ b/metadata/md5-cache/games-strategy/triplea-0.9.0.2-r1
@@ -9,5 +9,5 @@ RDEPEND==dev-java/jgoodies-looks-2* =dev-java/commons-httpclient-3* dev-java/com
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_0_9_0_2_source_code_only.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=108a4d4ee152bacbcae17c36dfb97029
diff --git a/metadata/md5-cache/games-strategy/triplea-1.0.0.3 b/metadata/md5-cache/games-strategy/triplea-1.0.0.3
index b72233b0b6bb..4059e909b228 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.0.0.3
+++ b/metadata/md5-cache/games-strategy/triplea-1.0.0.3
@@ -9,5 +9,5 @@ RDEPEND==dev-java/jgoodies-looks-2* =dev-java/commons-httpclient-3* dev-java/app
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_0_0_3_source_code_only.zip
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77a5f8ef376cc5dd3e86b469a5f3aad6
diff --git a/metadata/md5-cache/games-util/searchtool-0.4.4 b/metadata/md5-cache/games-util/searchtool-0.4.4
index 6abf8b662c6e..d46e6c62a710 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
 SLOT=0
 SRC_URI=mirror://sourceforge/searchtool/searchtool-0.4.4.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	games	81964dcd902c8f9d7ea64cb18295a13b	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=970d0abfcff3f81165f3ecdc5d451a44
diff --git a/metadata/md5-cache/java-virtuals/jmx-1.0-r3 b/metadata/md5-cache/java-virtuals/jmx-1.0-r3
index eac837a92725..e455ac35389a 100644
--- a/metadata/md5-cache/java-virtuals/jmx-1.0-r3
+++ b/metadata/md5-cache/java-virtuals/jmx-1.0-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for Java Management Extensions (JMX)
 EAPI=4
 HOMEPAGE=http://www.gentoo.org
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-virtuals-2	99b1a71af8f8c9fcbab6fe6bc4684a76	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=57e5606fb3e9ad7db20cb9f67bd67e86
+_md5_=bcc3b358e5b4548a946fc55753e07b2b
diff --git a/metadata/md5-cache/kde-base/krossjava-4.7.4 b/metadata/md5-cache/kde-base/krossjava-4.7.4
index 96d46156f045..2ded67c6c1fe 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.7.4
+++ b/metadata/md5-cache/kde-base/krossjava-4.7.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icon
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.7.4/src/kross-interpreters-4.7.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	7fb45a63d68690ea0b8627f53b09a222	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	7fb45a63d68690ea0b8627f53b09a222	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=3131f91bc82863a58b20c22919350a94
diff --git a/metadata/md5-cache/kde-base/krossjava-4.8.3 b/metadata/md5-cache/kde-base/krossjava-4.8.3
index b30bdcfc98f5..3235ed93f478 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.8.3
+++ b/metadata/md5-cache/kde-base/krossjava-4.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icon
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/4.8.3/src/kross-interpreters-4.8.3.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	7fb45a63d68690ea0b8627f53b09a222	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	kde4-base	7fb45a63d68690ea0b8627f53b09a222	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	kde4-meta	5cf727930b5b99df26a23ea5aa7ec0c4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
 _md5_=a6856b2779b0ba0c244b72116599402a
diff --git a/metadata/md5-cache/media-gfx/aoi-2.5 b/metadata/md5-cache/media-gfx/aoi-2.5
index 873bdddc2da1..d38ec1794ae6 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e05e896cebe26b518503f1e7c3749820
diff --git a/metadata/md5-cache/media-gfx/aoi-2.7.2 b/metadata/md5-cache/media-gfx/aoi-2.7.2
index 0b637ba653ca..888c19648d4d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=355767fc51e57c5ef66ec50c666c522b
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2 b/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
new file mode 100644
index 000000000000..5e01c19f4050
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/icoutils-0.29.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur).
+EAPI=2
+HOMEPAGE=http://www.nongnu.org/icoutils/
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/icoutils/icoutils-0.29.1.tar.bz2
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=1a46b53158aed6b2069deac5712c2ae3
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 44dd0b4a352d..9c4d682f5330 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2cc2c09f7b387cec221af063fc583823
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r2
index 31f756ae6ad3..845da1080766 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!media-libs/jpeg:0 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=4
 HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/
@@ -10,4 +10,4 @@ RDEPEND=!media-libs/jpeg:0 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-c
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.2.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=65f627e9208d45ed73e8203e9172c736
+_md5_=6bd1d9f51e8f12c0644357089c87d2b9
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
index e37e288e1cee..32ed81126bc1 100644
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1
@@ -8,4 +8,4 @@ RESTRICT=bindist
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	7bd9188561818b742702e8b7b21fd8d3	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ab241f2634e30edae0883b302513bf2e
+_md5_=8fcec76fe1cf3ade3c544b1e6f931a17
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.2.0.20110419-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.2.0.20110419-r1
deleted file mode 100644
index 62b6ce244605..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-live-0.2.0.20110419-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
-DESCRIPTION=VDR Plugin: Web Access To Settings
-EAPI=3
-HOMEPAGE=http://live.vdr-developer.org
-IUSE=ssl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://gentoo/vdr-live-0.2.0.20110419.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=b6fe4f9668e8b9ab554ff45d89cedf35
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.2.0.20120114-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
similarity index 55%
rename from metadata/md5-cache/media-plugins/vdr-live-0.2.0.20120114-r1
rename to metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
index 356cde6ebbbd..d803fdd885f4 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.2.0.20120114-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.2.0_p20120325
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
+DEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl )
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=4
 HOMEPAGE=http://live.vdr-developer.org
-IUSE=ssl ssl
+IUSE=pcre ssl ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 >=dev-libs/libpcre-8.12[cxx] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr >=dev-libs/tntnet-2.0[ssl=,sdk] >=dev-libs/cxxtools-2.0 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
-SRC_URI=mirror://gentoo/vdr-live-0.2.0.20120114.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=32b7f89f768e8b3b831fd381ce1b9e9b
+SRC_URI=mirror://gentoo/vdr-live-0.2.0_p20120325.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	7ae1f2c90dfa49d54bed1843a93f1703
+_md5_=82713321a918d89eedea05af6b179b84
diff --git a/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1 b/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
index 5c70941ec599..cd4dd9c674e8 100644
--- a/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
+++ b/metadata/md5-cache/media-radio/ax25-apps-0.0.6-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libax25-0.0.7
 SLOT=0
 SRC_URI=mirror://sourceforge/ax25/ax25-apps-0.0.6.tar.gz
-_md5_=249616ed72449f4b18ba36f51d4754a9
+_md5_=decdd5d8565b09531b2c33eaa78f27b1
diff --git a/metadata/md5-cache/media-sound/asunder-2.2 b/metadata/md5-cache/media-sound/asunder-2.2
index 95be391f8451..2ea82a191803 100644
--- a/metadata/md5-cache/media-sound/asunder-2.2
+++ b/metadata/md5-cache/media-sound/asunder-2.2
@@ -4,9 +4,9 @@ DESCRIPTION=A graphical Audio CD ripper and encoder with support for WAV, MP3, O
 EAPI=4
 HOMEPAGE=http://littlesvr.ca/asunder/
 IUSE=flac mp3 vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mp3? ( media-sound/lame ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.2.tar.bz2
-_md5_=8482f2f8f7caff1f4ac881440c26bd0f
+_md5_=37c02996b04ecbaee9a7370bdaf7ea52
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
index e57524e1049a..48e519f3c496 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=494d48cc2266652c5abb2f37ded0bf37
diff --git a/metadata/md5-cache/media-sound/jtagger-1.0 b/metadata/md5-cache/media-sound/jtagger-1.0
index ad6e719bc612..da594d60faa9 100644
--- a/metadata/md5-cache/media-sound/jtagger-1.0
+++ b/metadata/md5-cache/media-sound/jtagger-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/jlayer >=dev-java/jid3-0.46-r1 >=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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c34a8865f80e2d1f4554371f3d6c058e
diff --git a/metadata/md5-cache/media-sound/jtagger-1.0_pre20080428 b/metadata/md5-cache/media-sound/jtagger-1.0_pre20080428
index 097b1580aa4a..9d1ed9f74a23 100644
--- a/metadata/md5-cache/media-sound/jtagger-1.0_pre20080428
+++ b/metadata/md5-cache/media-sound/jtagger-1.0_pre20080428
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/jlayer >=dev-java/jid3-0.46-r1 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dronten.googlepages.com/jtagger-2008.04.28.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bbfd7b06e661a697fbeccb4d14cb00b4
diff --git a/metadata/md5-cache/media-sound/mixxx-1.10.0 b/metadata/md5-cache/media-sound/mixxx-1.10.0
index 5a21d756ac4b..75b3b2838873 100644
--- a/metadata/md5-cache/media-sound/mixxx-1.10.0
+++ b/metadata/md5-cache/media-sound/mixxx-1.10.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig dev-util/scons
+DEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig dev-util/scons
 DESCRIPTION=A Qt based Digital DJ tool
 EAPI=4
 HOMEPAGE=http://mixxx.sourceforge.net
 IUSE=aac debug doc mp3 pulseaudio shout wavpack
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack )
+RDEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://downloads.mixxx.org/mixxx-1.10.0/mixxx-1.10.0-src.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=48dfdb1a7e4c1879358665f79faa503f
+_md5_=8acd105f7a0f12711df6788dfa249151
diff --git a/metadata/md5-cache/media-sound/protux-0.50.100 b/metadata/md5-cache/media-sound/protux-0.50.100
index c7ca8c6a18a4..cd5e7bf90926 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d0b84515dfdf8795c980cd9e0f2f5433
diff --git a/metadata/md5-cache/media-sound/rhythmbox-2.95 b/metadata/md5-cache/media-sound/rhythmbox-2.95
index 900a9895c536..5602b1ef2314 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-2.95
+++ b/metadata/md5-cache/media-sound/rhythmbox-2.95
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=4
 HOMEPAGE=http://www.rhythmbox.org/
 IUSE=cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+RDEPEND=>=dev-libs/glib-2.26.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) gnome-keyring? ( python ) webkit? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/2.95/rhythmbox-2.95.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=f405a09bd9731b5e36a3e8fff5b5ed03
+_md5_=4f5c4fcac9375ec4c04af0a9c8bcd848
diff --git a/metadata/md5-cache/media-sound/rhythmbox-2.96 b/metadata/md5-cache/media-sound/rhythmbox-2.96
index 72d42487ba79..ba92d25f5cc0 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-2.96
+++ b/metadata/md5-cache/media-sound/rhythmbox-2.96
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) virtual/pkgconfig >=dev-util/intltool-0.35 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=4
 HOMEPAGE=http://www.rhythmbox.org/
 IUSE=cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10 >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
+RDEPEND=>=dev-libs/glib-2.28.0:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.2:3[introspection] >=x11-libs/gdk-pixbuf-2.18.0:2 >=dev-libs/gobject-introspection-0.10.0 >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-2.32.1 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.32:0.10[introspection] >=media-libs/gstreamer-0.10.32:0.10[introspection] >=sys-libs/tdb-1.2.6 clutter? ( >=media-libs/clutter-1.2:1.0 >=media-libs/clutter-gst-1.0:1.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.11:3.0 >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) html? ( >=net-libs/webkit-gtk-1.3.9:3 ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 gnome-base/gconf:2 ) python? ( dev-python/pygobject:3 ) udev? ( ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) zeitgeist? ( gnome-extra/zeitgeist ) >=media-plugins/gst-plugins-soup-0.10 >=media-plugins/gst-plugins-libmms-0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10 >=media-plugins/gst-plugins-cdio-0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6 x11-themes/gnome-icon-theme-symbolic upnp? ( >=media-libs/grilo-0.1.17 >=media-plugins/grilo-plugins-0.1.17[upnp] ) python? ( >=dev-python/gst-python-0.10.8 x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( dev-python/gnome-keyring-python ) webkit? ( dev-python/mako >=net-libs/webkit-gtk-1.3.9:3[introspection] ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) python? ( || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) gnome-keyring? ( python ) webkit? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/2.96/rhythmbox-2.96.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=402e7d6f60ec977f4a9034df77e25516
+_md5_=70dd8649949ed912337471bf8e699b3c
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5 b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
index 5aae4f1dc199..c32035f82d71 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
+++ b/metadata/md5-cache/media-sound/wildmidi-0.2.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Midi processing library and a midi player using the gus patch set
 EAPI=3
 HOMEPAGE=http://wildmidi.sourceforge.net/
 IUSE=alsa debug
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 SLOT=0
 SRC_URI=mirror://sourceforge/wildmidi/wildmidi-0.2.3.5.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=10eea94bcafb76f4836843a2b00c610f
+_md5_=5823291fef7f46927594d421f3e93610
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 6c4443e33bbb..546d5570a4aa 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5eddfeff6a481523e41c39f96bcc9b01
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.1 b/metadata/md5-cache/media-tv/tvbrowser-3.1
index 1a6330e92161..d901381cfb0b 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.1
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsh >=dev-java/commons-codec-1.4 >=dev-java/commons-lang-2.4 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=930fd1bc02a8ba9b4938d09c8a9744c9
diff --git a/metadata/md5-cache/media-video/2mandvd-1.8.1 b/metadata/md5-cache/media-video/2mandvd-1.8.1
new file mode 100644
index 000000000000..8ab42fc4e109
--- /dev/null
+++ b/metadata/md5-cache/media-video/2mandvd-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=media-libs/libsdl virtual/ffmpeg virtual/glu virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4
+DESCRIPTION=The successor of ManDVD
+EAPI=4
+HOMEPAGE=http://kde-apps.org/content/show.php?content=99450
+IUSE=debug linguas_cs linguas_de linguas_en linguas_it linguas_ru
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl virtual/ffmpeg virtual/glu virtual/opengl x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 || ( app-cdr/cdrkit app-cdr/cdrtools ) dev-lang/perl media-fonts/dejavu media-gfx/exif media-libs/netpbm media-sound/sox media-video/dvdauthor media-video/ffmpegthumbnailer media-video/mjpegtools media-video/mplayer[encode]
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/2mandvd/2mandvd-1.8.1.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=e68c54e75f10393ce7edc665d88d6359
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 f7e8986946b6..5993194690d5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2936f910774ffe6d4a2d1059dd393f4e
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.2 b/metadata/md5-cache/media-video/google2srt-0.5.2
index 7c03b8441370..ea89bc6d5c74 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.2
+++ b/metadata/md5-cache/media-video/google2srt-0.5.2
@@ -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.2.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5da7b3a43443afcd6434f9b6e895dba4
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.3 b/metadata/md5-cache/media-video/google2srt-0.5.3
index 1a65a8dddcf5..5e8ec62267dc 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2883bc4294912a9cee85518fa2ae46a
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 915a1f8ef053..21cff5ac67ce 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[ass] ) 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	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6faa652ed9ee7522fe716728249811bc
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-5.6.0 b/metadata/md5-cache/media-video/mkvtoolnix-5.6.0
index 329acd70c9c9..cfb05d2a361d 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-5.6.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-5.6.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-ruby/rake virtual/pkgconfig
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.6.0.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=cd24e098134786b77237dd48affea5b2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_md5_=e92a559a663679a1e29f189ce8f5fc1f
diff --git a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4 b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
index b49fa6a3ace7..3c7598117666 100644
--- a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
+++ b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DEPEND=x11-libs/libX11 virtual/jpeg
 DESCRIPTION=Tools for MPEG video
 HOMEPAGE=http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 virtual/jpeg
 SLOT=0
 SRC_URI=ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=07ba4987672f08df3730600d9544c4cb
+_md5_=aafd2ae98a91760aaf7bc0b155868036
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.02 b/metadata/md5-cache/media-video/projectx-0.91.0.02
index 17370099d74a..21cb685ea4d7 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.02
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.02
@@ -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.02.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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b651efa88bbc08f98c152f9e5a884066
diff --git a/metadata/md5-cache/media-video/totem-3.2.2 b/metadata/md5-cache/media-video/totem-3.2.2
index 9a0e2bc1d44f..fccde7b5e21a 100644
--- a/metadata/md5-cache/media-video/totem-3.2.2
+++ b/metadata/md5-cache/media-video/totem-3.2.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.2/totem-3.2.2.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cf0f2c6d2bbc41e9e158933648d6d982
+_md5_=9dfec2a73157d939a751cc1414075d81
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7-r1 b/metadata/md5-cache/net-analyzer/arpon-2.7-r1
index 5434f6693373..f1cbc1e7c6e9 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7-r1
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler.
-EAPI=2
+EAPI=4
 HOMEPAGE=http://arpon.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6d35e1a99959d57a9c0d0dd9c5afe7a4
+_md5_=c9583551c12bc92a401efd5ecd5811e4
diff --git a/metadata/md5-cache/net-analyzer/gspoof-3.2-r2 b/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
index a371ef381a15..679d46c95bfe 100644
--- a/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
+++ b/metadata/md5-cache/net-analyzer/gspoof-3.2-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 net-libs/libnet:1.1 || ( >=sys-devel/auto
 DESCRIPTION=A simple GTK/command line TCP/IP packet generator
 EAPI=4
 HOMEPAGE=http://gspoof.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://gspoof.sourceforge.net/src/gspoof-3.2.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c7d7acbfae042db9dfa8369c2d8f49ad
+_md5_=cab2b49c4016a260074a2c5bc6d4c6bd
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-0.9.9 b/metadata/md5-cache/net-analyzer/nagstamon-0.9.9
index d818d18efa62..a2bc3b7d45a1 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-0.9.9
+++ b/metadata/md5-cache/net-analyzer/nagstamon-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=Nagstamon is a Nagios status monitor for a systray and displays a re
 EAPI=4
 HOMEPAGE=http://nagstamon.sourceforge.net
 IUSE=gnome sound
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk dev-python/lxml dev-python/beautifulsoup gnome? ( dev-python/egg-python ) sound? ( media-sound/sox ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/nagstamon/nagstamon_0.9.9.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d4e787a30d30487e325b1a64d5b32d61
+_md5_=14adfb46ca5f3b199d7291c4f04fded1
diff --git a/metadata/md5-cache/net-analyzer/tcpflow-1.2.7 b/metadata/md5-cache/net-analyzer/tcpflow-1.2.7
new file mode 100644
index 000000000000..57d16e27a438
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpflow-1.2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=net-libs/libpcap sys-libs/zlib test? ( sys-apps/coreutils )
+DESCRIPTION=A tool for monitoring, capturing and storing TCP connections flows
+EAPI=4
+HOMEPAGE=https://github.com/simsong/tcpflow
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://github/simsong/tcpflow/tcpflow-1.2.7.tar.gz
+_md5_=d53d9d73757aaf843362f51a9edd9712
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1 b/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
index 0fbd0bde74a1..dd9b4fc5002b 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
+++ b/metadata/md5-cache/net-firewall/fwbuilder-5.0.1.3592-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel
 DESCRIPTION=A firewall GUI
 EAPI=4
 HOMEPAGE=http://www.fwbuilder.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils
 SLOT=0
 SRC_URI=mirror://sourceforge/fwbuilder/fwbuilder-5.0.1.3592.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=48dac971f434fbb1625a552b348ca1de
+_md5_=412464240962936adb58e39a7a9679c5
diff --git a/metadata/md5-cache/net-ftp/frox-0.7.18-r4 b/metadata/md5-cache/net-ftp/frox-0.7.18-r4
index 5641348f8b35..60dd0d7f0819 100644
--- a/metadata/md5-cache/net-ftp/frox-0.7.18-r4
+++ b/metadata/md5-cache/net-ftp/frox-0.7.18-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A transparent ftp proxy
 EAPI=4
 HOMEPAGE=http://frox.sourceforge.net/
 IUSE=clamav ssl transparent
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 SLOT=0
 SRC_URI=http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ae5f46ecc2f9075a3db87654b0649c95
+_md5_=6ba340f7ccd7d15434c70624a499b893
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r1 b/metadata/md5-cache/net-ftp/ncftp-3.2.5-r1
index 5f5147ecead8..4fceafd05804 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r1
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An extremely configurable ftp client
 EAPI=4
 HOMEPAGE=http://www.ncftp.com/
 IUSE=pch
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=ftp://ftp.ncftp.com/ncftp/ncftp-3.2.5-src.tar.bz2 -> ncftp-3.2.5.474.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a16d7f580ac1bb4790d444790257c755
+_md5_=acf58d72b9495569dade7ce00c99fe6b
diff --git a/metadata/md5-cache/net-im/emesene-1.6.3-r1 b/metadata/md5-cache/net-im/emesene-1.6.3-r1
deleted file mode 100644
index bd052cb3b7c4..000000000000
--- a/metadata/md5-cache/net-im/emesene-1.6.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Platform independent MSN Messenger client written in Python+GTK
-EAPI=2
-HOMEPAGE=http://www.emesene.org
-IUSE=webcam
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2 webcam? ( media-plugins/gst-plugins-meta[v4l] dev-python/gst-python media-libs/libmimic ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/emesene/emesene-1.6.3.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=281c92c9efd0177205172b26eb41858f
diff --git a/metadata/md5-cache/net-im/kouchat-0.9.8 b/metadata/md5-cache/net-im/kouchat-0.9.8
index 3f9f6dee729f..be96a2666874 100644
--- a/metadata/md5-cache/net-im/kouchat-0.9.8
+++ b/metadata/md5-cache/net-im/kouchat-0.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://kouchat.googlecode.com/files/kouchat-0.9.8-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=88bdf29363138e66c02dcb4ac905afc1
diff --git a/metadata/md5-cache/net-im/openfire-3.6.1 b/metadata/md5-cache/net-im/openfire-3.6.1
index a051c46f4b38..004e3407c1fa 100644
--- a/metadata/md5-cache/net-im/openfire-3.6.1
+++ b/metadata/md5-cache/net-im/openfire-3.6.1
@@ -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_6_1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=820115d245de49766e086c92e82c9481
diff --git a/metadata/md5-cache/net-im/openfire-3.6.3 b/metadata/md5-cache/net-im/openfire-3.6.3
index 6298cff40711..eb7a348ea561 100644
--- a/metadata/md5-cache/net-im/openfire-3.6.3
+++ b/metadata/md5-cache/net-im/openfire-3.6.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_6_3.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=568ddb68946adbb1fb4ba96e218f3780
diff --git a/metadata/md5-cache/net-im/openfire-3.6.4 b/metadata/md5-cache/net-im/openfire-3.6.4
index f2246ba90892..0345dcd0b6a6 100644
--- a/metadata/md5-cache/net-im/openfire-3.6.4
+++ b/metadata/md5-cache/net-im/openfire-3.6.4
@@ -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_6_4.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9151d5620d8d7825917d5780ce078f14
diff --git a/metadata/md5-cache/net-im/openfire-3.7.0 b/metadata/md5-cache/net-im/openfire-3.7.0
index 736136632ad4..8da77d81b68a 100644
--- a/metadata/md5-cache/net-im/openfire-3.7.0
+++ b/metadata/md5-cache/net-im/openfire-3.7.0
@@ -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_7_0.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8046ef60f77213399b242ff0fa07b34
diff --git a/metadata/md5-cache/net-im/openfire-3.7.1 b/metadata/md5-cache/net-im/openfire-3.7.1
index a5cf89f4d96b..f4ac3f320542 100644
--- a/metadata/md5-cache/net-im/openfire-3.7.1
+++ b/metadata/md5-cache/net-im/openfire-3.7.1
@@ -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_7_1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ffa085430eac97b3c1476cf98841172
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.4 b/metadata/md5-cache/net-im/pidgin-2.10.4
index 7f83a2435531..8cffe23c17b2 100644
--- a/metadata/md5-cache/net-im/pidgin-2.10.4
+++ b/metadata/md5-cache/net-im/pidgin-2.10.4
@@ -4,10 +4,10 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=4
 HOMEPAGE=http://pidgin.im/
 IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( <dev-lang/python-3 ) python? ( <dev-lang/python-3 ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( gnome-extra/evolution-data-server ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* || ( net-libs/farstream net-libs/farsight2 ) media-plugins/gst-plugins-meta media-plugins/gst-plugins-gconf ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.10.4.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=375d84ed22509bad09d2ca739bce97c7
+_md5_=00fb6475fef0a6720466d3065e61cd27
diff --git a/metadata/md5-cache/net-im/qtwitter-0.10.0-r1 b/metadata/md5-cache/net-im/qtwitter-0.10.0-r1
index b9cbc187fc28..298fbd8ddf3b 100644
--- a/metadata/md5-cache/net-im/qtwitter-0.10.0-r1
+++ b/metadata/md5-cache/net-im/qtwitter-0.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt-based microblogging client
 EAPI=4
 HOMEPAGE=http://www.qt-apps.org/content/show.php/qTwitter?content=99087
 IUSE=debug linguas_nb_NO linguas_pt_BR linguas_ca linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_pl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/libX11 >=x11-libs/qt-core-4.5:4 >=x11-libs/qt-gui-4.5:4 >=x11-libs/qt-dbus-4.5:4 >=dev-libs/qoauth-1.0
 SLOT=0
 SRC_URI=http://files.ayoy.net/qtwitter/release/0.10.0/src/qtwitter-0.10.0-src.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6ec28571bf196b846bd875474550abde
+_md5_=5e3f0e877348b2c6fdee2b464f7e5703
diff --git a/metadata/md5-cache/net-irc/jircii-41 b/metadata/md5-cache/net-irc/jircii-41
index 31ae13467ec4..cd55d73856a7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d67b77df1d67acf9f8e65a773fba420
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330 b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
index 2376ca6c74d7..df51aa1e6988 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e3906e0978cf3a34d854cda1f73ac59
diff --git a/metadata/md5-cache/net-libs/aqbanking-5.0.24.0 b/metadata/md5-cache/net-libs/aqbanking-5.0.24.0
new file mode 100644
index 000000000000..702f4c934aa5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/aqbanking-5.0.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-misc/ktoblzcheck-1.37 >=dev-libs/gmp-5 >=sys-libs/gwenhywfar-4.3.3[gtk?] virtual/libintl ofx? ( >=dev-libs/libofx-0.9.4 ) chipcard? ( >=sys-libs/libchipcard-5.0.2 ) virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen )
+DESCRIPTION=Generic Online Banking Interface
+EAPI=4
+HOMEPAGE=http://www.aquamaniac.de/aqbanking/
+IUSE=chipcard debug doc examples gtk ofx
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-misc/ktoblzcheck-1.37 >=dev-libs/gmp-5 >=sys-libs/gwenhywfar-4.3.3[gtk?] virtual/libintl ofx? ( >=dev-libs/libofx-0.9.4 ) chipcard? ( >=sys-libs/libchipcard-5.0.2 )
+SLOT=0
+SRC_URI=http://www.aquamaniac.de/sites/download/download.php?package=03&release=94&file=01&dummy=aqbanking-5.0.24.0-git.tar.gz -> aqbanking-5.0.24.0-git.tar.gz
+_md5_=2be218a5659eebe045a928596a6b2116
diff --git a/metadata/md5-cache/net-libs/libnet-1.0.2a-r4 b/metadata/md5-cache/net-libs/libnet-1.0.2a-r4
index 6a4c47d92b64..8229a573f1f7 100644
--- a/metadata/md5-cache/net-libs/libnet-1.0.2a-r4
+++ b/metadata/md5-cache/net-libs/libnet-1.0.2a-r4
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=library to provide an API for commonly used low-level network functions (mainly packet injection)
 EAPI=4
 HOMEPAGE=http://www.packetfactory.net/libnet/
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 SLOT=1.0
 SRC_URI=http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a520b497d5410dc4aa6b92ce6365a589
+_md5_=36814cb2a4bf20eb4247f07f37534bca
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.8.2-r2 b/metadata/md5-cache/net-libs/libvncserver-0.9.8.2-r2
index cbfd495bb499..ecb0b4832391 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.8.2-r2
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.8.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=library for creating vnc servers
 EAPI=4
 HOMEPAGE=http://libvncserver.sourceforge.net/
 IUSE=no24bpp crypt gnutls ipv6 +jpeg test threads +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=crypt? ( dev-libs/libgcrypt ) gnutls? ( net-libs/gnutls ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://libvncserver.sourceforge.net/LibVNCServer-0.9.8.2.tar.gz mirror://sourceforge/libvncserver/LibVNCServer-0.9.8.2.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=93ac87189ffcd7bb052e012582355e93
+_md5_=d190dc15f9a93feccd4f19bc9739a0e3
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
index 1fd0893244c0..e7c745415e03 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 c774414deff4..3798ec9c406b 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	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 4f25eb82ba23..a7451324df14 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=474656cb23ec2ce9cdce392df570311e
diff --git a/metadata/md5-cache/net-libs/openslp-1.2.1-r2 b/metadata/md5-cache/net-libs/openslp-1.2.1-r2
index 39c654f39611..88ca90d6305a 100644
--- a/metadata/md5-cache/net-libs/openslp-1.2.1-r2
+++ b/metadata/md5-cache/net-libs/openslp-1.2.1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An open-source implementation of Service Location Protocol
 HOMEPAGE=http://www.openslp.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-1.2.1.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fdc750e2f6897c94b461dca40ddde6f3
+_md5_=5ef20b19476e84473d29ddbb8f3cd7e4
diff --git a/metadata/md5-cache/net-mail/Freemail-9999 b/metadata/md5-cache/net-mail/Freemail-9999
index f01214831cde..6956b7a715c5 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[freemail] >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	git-2	15733ab6a6feb34af9837b41623c2bad	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=353fa0ad2d0387b37b44e9c2caa8c142
diff --git a/metadata/md5-cache/net-misc/bfgminer-2.4.2 b/metadata/md5-cache/net-misc/bfgminer-2.4.2
new file mode 100644
index 000000000000..a30972c723f4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bfgminer-2.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) opencl? ( virtual/opencl ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+DESCRIPTION=Modular Bitcoin CPU/GPU/FPGA miner in C
+EAPI=4
+HOMEPAGE=https://bitcointalk.org/index.php?topic=78192.0
+IUSE=+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 )
+REQUIRED_USE=|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+SLOT=0
+SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/2.4.2/bfgminer-2.4.2.tbz2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=3734fa44d75c3993e971260c8313bcea
diff --git a/metadata/md5-cache/net-misc/cgminer-2.4.2 b/metadata/md5-cache/net-misc/cgminer-2.4.2
new file mode 100644
index 000000000000..ca4ca99b0b76
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cgminer-2.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+DESCRIPTION=Bitcoin CPU/GPU/FPGA miner in C
+EAPI=4
+HOMEPAGE=https://bitcointalk.org/index.php?topic=28402.0
+IUSE=+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( virtual/libusb:1 )
+REQUIRED_USE=|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+SLOT=0
+SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-2.4.2.tar.bz2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d1298d6d61d2ba06a70098719c0522a8
diff --git a/metadata/md5-cache/net-misc/efax-0.9a-r3 b/metadata/md5-cache/net-misc/efax-0.9a-r3
index 3071a4140db4..2b8a28cc74ac 100644
--- a/metadata/md5-cache/net-misc/efax-0.9a-r3
+++ b/metadata/md5-cache/net-misc/efax-0.9a-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A simple fax program for single-user systems
 EAPI=4
 HOMEPAGE=http://gentoo.org
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cce.com/efax/download/efax-0.9a-001114.tar.gz mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ac0e2e79510fcc09f681e52ec7bdf000
+_md5_=683d737b09d96edac9263fa481a5c38a
diff --git a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0 b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0
index ad8689ca77c6..bdc378d387ef 100644
--- a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0
+++ b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/jsap >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.moldaner.de/wakeonlan/download/wakeonlan-1.0.0.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7267349d81067920ffa05e3a521cfcea
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 50e37165a2f5..235b7547fea7 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b144d0339848a70b9abe6196e8ea6374
diff --git a/metadata/md5-cache/net-misc/jrdesktop-0.2.0030 b/metadata/md5-cache/net-misc/jrdesktop-0.2.0030
index 3856a9a54b0d..228f07b4c3ee 100644
--- a/metadata/md5-cache/net-misc/jrdesktop-0.2.0030
+++ b/metadata/md5-cache/net-misc/jrdesktop-0.2.0030
@@ -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-0.2.0030.src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3d5cc7234517c8117552a416c4d8f53a
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 7962d5f8268a..54d60ce15a34 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=28c55d1c63b8ab6034b3ff1afcfc862c
diff --git a/metadata/md5-cache/net-misc/mindterm-3.1.2 b/metadata/md5-cache/net-misc/mindterm-3.1.2
index 1bbd94ee5252..bc57f0eb0062 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.1.2
+++ b/metadata/md5-cache/net-misc/mindterm-3.1.2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jzlib >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.appgate.com/products/80_MindTerm/110_MindTerm_Download/mindterm_3.1.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2025e2f1fc6a424316d8765bd7c2c7a
diff --git a/metadata/md5-cache/net-misc/mindterm-3.2 b/metadata/md5-cache/net-misc/mindterm-3.2
index ec35f49606d1..2d6b2e40939c 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.2
+++ b/metadata/md5-cache/net-misc/mindterm-3.2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jzlib >=dev-java/java-config-2.1.9-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.appgate.com/products/80_MindTerm/110_MindTerm_Download/mindterm_3.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fd379fe71982565e10e4599325099931
diff --git a/metadata/md5-cache/net-misc/mindterm-3.2-r1 b/metadata/md5-cache/net-misc/mindterm-3.2-r1
index 135d59124c54..5e10b0d6331f 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.2-r1
+++ b/metadata/md5-cache/net-misc/mindterm-3.2-r1
@@ -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/products/80_MindTerm/110_MindTerm_Download/mindterm_3.2-src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fee13f7743e3d30bcf074c395d8789ff
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index 8b8a2c4a0c2a..2dc519315d4c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1a7d0ac46a35e5a36de74670da671889
diff --git a/metadata/md5-cache/net-misc/miniupnpd-1.6 b/metadata/md5-cache/net-misc/miniupnpd-1.6
deleted file mode 100644
index 57d3a6433419..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=net-firewall/iptables-1.4.6 sys-apps/lsb-release >=sys-kernel/linux-headers-2.6.31 sys-apps/util-linux
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=2
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6 sys-apps/lsb-release >=sys-kernel/linux-headers-2.6.31
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-1.6.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7571aeb5b0779668138c0578398cde71
diff --git a/metadata/md5-cache/net-misc/miniupnpd-1.7_pre20120509 b/metadata/md5-cache/net-misc/miniupnpd-1.7
similarity index 81%
rename from metadata/md5-cache/net-misc/miniupnpd-1.7_pre20120509
rename to metadata/md5-cache/net-misc/miniupnpd-1.7
index bce7a085d14f..69dc1f96dd34 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-1.7_pre20120509
+++ b/metadata/md5-cache/net-misc/miniupnpd-1.7
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=net-firewall/iptables-1.4.6
 SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-1.6.20120509.tar.gz
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-1.7.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=21c98dbcca5e5c328e4d4f4442739fa4
+_md5_=091e151975de5202320cace9bd54db2d
diff --git a/metadata/md5-cache/net-misc/radvd-1.8.5-r1 b/metadata/md5-cache/net-misc/radvd-1.8.5-r1
index 0f86223b0b9d..e4172de89f72 100644
--- a/metadata/md5-cache/net-misc/radvd-1.8.5-r1
+++ b/metadata/md5-cache/net-misc/radvd-1.8.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=4
 HOMEPAGE=http://v6web.litech.org/radvd/
 IUSE=kernel_FreeBSD selinux
-KEYWORDS=amd64 ~arm ~hppa ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~hppa ppc ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-1.8.5.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=69b01c5ada5c14394629e699ccff95aa
+_md5_=113a95eeee56556b9b591aafa4fbf2bd
diff --git a/metadata/md5-cache/net-misc/sobby-0.4.8 b/metadata/md5-cache/net-misc/sobby-0.4.8
index 88bd6ebfb915..a1b4848ae341 100644
--- a/metadata/md5-cache/net-misc/sobby-0.4.8
+++ b/metadata/md5-cache/net-misc/sobby-0.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=Standalone Obby server
 EAPI=4
 HOMEPAGE=http://gobby.0x539.de/
 IUSE=avahi
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.6 >=dev-libs/libsigc++-2.0 >=dev-libs/gmp-4.1.4 >=dev-cpp/libxmlpp-2.6 >=net-libs/net6-1.3.12 >=net-libs/obby-0.4.6[avahi=]
 SLOT=0
 SRC_URI=http://releases.0x539.de/sobby/sobby-0.4.8.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e1bb99ed972053978472d8351a9b447a
+_md5_=d06b07c30905ad3e8c0f4681702203c0
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.1.0-r6 b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r6
new file mode 100644
index 000000000000..c7600930d9fa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Remote desktop viewer display system
+EAPI=1
+HOMEPAGE=http://www.tigervnc.org
+IUSE=nptl +opengl server +xorgmodule
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
+SLOT=0
+SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.1.0.tar.gz mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.11.4.tar.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=9ff83c5c2ac082c1983a889ab72ba18c
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7 b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7
new file mode 100644
index 000000000000..e73998011d52
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-1.1.0-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.12.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( virtual/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Remote desktop viewer display system
+EAPI=1
+HOMEPAGE=http://www.tigervnc.org
+IUSE=nptl +opengl server +xorgmodule
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.12.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
+SLOT=0
+SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.1.0.tar.gz mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.12.2.tar.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=b992e35501919360f4ea77483ab1b940
diff --git a/metadata/md5-cache/net-misc/vtun-3.0.2-r1 b/metadata/md5-cache/net-misc/vtun-3.0.2-r1
index fa719faf3d18..5e3fcd6dc1de 100644
--- a/metadata/md5-cache/net-misc/vtun-3.0.2-r1
+++ b/metadata/md5-cache/net-misc/vtun-3.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Create virtual tunnels over TCP/IP networks with traffic shaping, en
 EAPI=4
 HOMEPAGE=http://vtun.sourceforge.net/
 IUSE=lzo socks5 ssl zlib
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=79a3cc8e49e4fc4d00b7e5c87599f969
+_md5_=d464ab0b432c6dc8b72320f6130aa62c
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2 b/metadata/md5-cache/net-nds/jxplorer-3.2
index dff2739e2c9f..39fd72546032 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af802c9cfa5eaa6a0f86bd7904cc50d2
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2-r2 b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
index cec1b8d8ebc2..89d24fbaf189 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=79c9ab3be10d15dd88e7498db0852053
diff --git a/metadata/md5-cache/net-p2p/amule-2.2.6 b/metadata/md5-cache/net-p2p/amule-2.2.6
deleted file mode 100644
index bce816553594..000000000000
--- a/metadata/md5-cache/net-p2p/amule-2.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare setup
-DEPEND==x11-libs/wxGTK-2.8* >=dev-libs/crypto++-5 >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0 unicode? ( >=media-libs/gd-2.0.26 ) )
-DESCRIPTION=aMule, the all-platform eMule p2p client
-EAPI=2
-HOMEPAGE=http://www.amule.org/
-IUSE=daemon debug geoip gtk nls remote stats unicode upnp
-KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND==x11-libs/wxGTK-2.8* >=dev-libs/crypto++-5 >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0 unicode? ( >=media-libs/gd-2.0.26 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/amule/aMule-2.2.6.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=bd699b3eebeaf5c42fd478c3e3761184
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.1 b/metadata/md5-cache/net-p2p/amule-2.3.1
index b347ab6e7b9d..79d30add6bf2 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.1
+++ b/metadata/md5-cache/net-p2p/amule-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=aMule, the all-platform eMule p2p client
 EAPI=2
 HOMEPAGE=http://www.amule.org/
 IUSE=daemon debug geoip nls remote stats unicode upnp +X
-KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/crypto++-5 >=sys-libs/zlib-1.2.1 stats? ( >=media-libs/gd-2.0.26[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0 unicode? ( >=media-libs/gd-2.0.26 ) ) X? ( >=x11-libs/wxGTK-2.8.12[X] ) !X? ( >=x11-libs/wxGTK-2.8.12 )
 SLOT=0
 SRC_URI=mirror://sourceforge/amule/aMule-2.3.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=c20477ac8017195efa58e37d020a8f47
+_md5_=4c9edf26027c3fa58260f8f7e781ffae
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1406 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1406
index 413dc35251ef..bf9d700dae37 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1406
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1406
@@ -10,5 +10,5 @@ PDEPEND=net-libs/NativeThread
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger freemail? ( >=dev-java/bcprov-1.45 ) dev-java/commons-compress dev-db/db-je:3.3 dev-java/fec dev-java/java-service-wrapper dev-java/db4o-jdk11 dev-java/db4o-jdk12 dev-java/db4o-jdk5 dev-java/jbitcollider-core dev-java/lzma dev-java/lzmajio dev-java/mersennetwister >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/freenet/fred-official/zipball/build01406 -> freenet-0.7.5_p1406.zip mirror://gentoo/seednodes-20120404.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=10436ae27cced1937164fa73c63875e5
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1407 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1407
index 343b658b8f5b..07fe42b5bce8 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1407
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1407
@@ -10,5 +10,5 @@ PDEPEND=net-libs/NativeThread
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger freemail? ( >=dev-java/bcprov-1.45 ) dev-java/commons-compress dev-db/db-je:3.3 dev-java/fec dev-java/java-service-wrapper dev-java/db4o-jdk11 dev-java/db4o-jdk12 dev-java/db4o-jdk5 dev-java/jbitcollider-core dev-java/lzma dev-java/lzmajio dev-java/mersennetwister >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/freenet/fred-official/zipball/build01407 -> freenet-0.7.5_p1407.zip mirror://gentoo/seednodes-20120415.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=61f759ef8fe273d68fe41d4a72416c7c
diff --git a/metadata/md5-cache/net-p2p/frostwire-4.13.5-r1 b/metadata/md5-cache/net-p2p/frostwire-4.13.5-r1
index 441a7ab9c007..5c4ebdcea528 100644
--- a/metadata/md5-cache/net-p2p/frostwire-4.13.5-r1
+++ b/metadata/md5-cache/net-p2p/frostwire-4.13.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/asm dev-java/commons-logging dev-java/commons-net 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 >=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.frostwire.com/frostwire/4.13.5/frostwire-4.13.5.src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8e78190fb4e457a3c8aab3add3191df
diff --git a/metadata/md5-cache/net-p2p/frostwire-4.20.9 b/metadata/md5-cache/net-p2p/frostwire-4.20.9
index c045e00c95b3..8dadc6e08a59 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41b4c286833f16f1392e5f324b27db8c
diff --git a/metadata/md5-cache/net-p2p/myster-8.0-r1 b/metadata/md5-cache/net-p2p/myster-8.0-r1
index 3c0f8669c988..a3e83a955da5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d715697dd3532433883b00df552f11e7
diff --git a/metadata/md5-cache/net-p2p/phex-3.2.0.102 b/metadata/md5-cache/net-p2p/phex-3.2.0.102
index 6d9548de6bb9..a1402c54b26c 100644
--- a/metadata/md5-cache/net-p2p/phex-3.2.0.102
+++ b/metadata/md5-cache/net-p2p/phex-3.2.0.102
@@ -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 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=mirror://sourceforge/phex/phex_3.2.0.102_src.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a33e3619c2b64d011ff1849825fed4c1
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 15654704aac1..b87e347a8a9e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e81c0123e4fdf7265330fd0cfab3d4b
diff --git a/metadata/md5-cache/net-p2p/vuze-4.5.1.0 b/metadata/md5-cache/net-p2p/vuze-4.5.1.0
index 9ad0673cb143..57b511c6065d 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.5.1.0
+++ b/metadata/md5-cache/net-p2p/vuze-4.5.1.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.5.1.0
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.3 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 dev-java/swt:3.6[cairo] !net-p2p/azureus-bin >=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_4510/Vuze_4510_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f764315532417a323bc4fc0e8b41b23
diff --git a/metadata/md5-cache/net-p2p/vuze-4.6.0.2 b/metadata/md5-cache/net-p2p/vuze-4.6.0.2
index 2e948df8c539..3f30923f5c22 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.6.0.2
+++ b/metadata/md5-cache/net-p2p/vuze-4.6.0.2
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.6.0.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.3 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 dev-java/swt:3.6[cairo] !net-p2p/azureus-bin >=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_4602/Vuze_4602_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=572ad938487b9d3f4e98031905fbaa1a
diff --git a/metadata/md5-cache/net-p2p/vuze-4.7.0.0-r1 b/metadata/md5-cache/net-p2p/vuze-4.7.0.0-r1
index 0db1dc67b466..4a8ee1c8ac90 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.7.0.0-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.7.0.0-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.7.0.0
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.3 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 dev-java/swt:3.7[cairo] !net-p2p/azureus-bin >=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_4700/Vuze_4700_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93a3af979e136c3b568737de817cebab
diff --git a/metadata/md5-cache/net-p2p/vuze-4.7.0.2 b/metadata/md5-cache/net-p2p/vuze-4.7.0.2
index e3246c8114b1..f9666c4e7eb6 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.7.0.2
+++ b/metadata/md5-cache/net-p2p/vuze-4.7.0.2
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.7.0.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.3 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 dev-java/swt:3.7[cairo] !net-p2p/azureus-bin >=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_4702/Vuze_4702_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=52adafab8bda6ec8dcff35b2413d2b68
diff --git a/metadata/md5-cache/net-p2p/yaggui-0.9.2 b/metadata/md5-cache/net-p2p/yaggui-0.9.2
index 524ab3290cfe..aa28bb93e52f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8522cd38a7fe8c6a9888bde3b51d27ed
diff --git a/metadata/md5-cache/net-print/gmso2-0.1 b/metadata/md5-cache/net-print/gmso2-0.1
index 501778a187fb..3aca57bbe699 100644
--- a/metadata/md5-cache/net-print/gmso2-0.1
+++ b/metadata/md5-cache/net-print/gmso2-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/libmso:0 dev-java/jinklevel:0 >=dev-java/java-gnome-4.0.15 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ceff75a995479b8b4950d99b5574218
diff --git a/metadata/md5-cache/net-print/gmso2-0.1-r1 b/metadata/md5-cache/net-print/gmso2-0.1-r1
index 52626d591fb6..310c23f70c5d 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c885befb542b5c00ffde60e501ffeda3
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.2.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.2.2
index c2045d22005a..a178ca4a2c40 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.2.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.2.2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.25.7:2 >=x11-libs/gtk+-2.91.3:3[introspection?] >=x11-
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.2/gnome-bluetooth-3.2.2.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=71122dd0e89c27a3e619259bff52c0b5
+_md5_=2f27c5d9c657f4fe66679eb3124a4e82
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.4.0 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.4.0
index c6677e2e9ee4..116575ef3aad 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.4.0
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.4.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.29.90:2 >=x11-libs/gtk+-2.91.3:3[introspection?] >=x11
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.4/gnome-bluetooth-3.4.0.tar.xz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f673a7178999eb699c713a36b4f8ac3a
+_md5_=8f924aecf56ac5791405a78212c33642
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.6.1 b/metadata/md5-cache/sci-astronomy/celestia-1.6.1
index 478f7c814573..9917a92fb44a 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.6.1
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.6.1
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl virtual/jpeg media-libs/libpng >=dev-lang/lua-5.0 gtk? (
 SLOT=0
 SRC_URI=mirror://sourceforge/celestia/celestia-1.6.1.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=009cda7c768ae985bc029c5bb2bfe5ce
+_md5_=62af6cea9caeee8656f328f7fbfffe73
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.0 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.0
index 910fa7a601ac..e6ed20e80c7f 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.0
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 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.0.tar.gz doc? ( http://www.eso.org/sci/software/gasgano//VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=508196c852e61c347dcdbf0a6a69646a
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 09feb3f05f86..1bc66c83b470 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6721f7912a558149082c55361668d28e
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-9999 b/metadata/md5-cache/sci-biology/beast-mcmc-9999
index 74b9f867cba4..0eb7a066ef1f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e169b3e0583d376a2e88e7c39a6f26a1
diff --git a/metadata/md5-cache/sci-biology/clustalw-2.1 b/metadata/md5-cache/sci-biology/clustalw-2.1
index 8a15e5d32917..2e65a9b99638 100644
--- a/metadata/md5-cache/sci-biology/clustalw-2.1
+++ b/metadata/md5-cache/sci-biology/clustalw-2.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=General purpose multiple alignment program for DNA and proteins
 EAPI=4
 HOMEPAGE=http://www.clustal.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3 LGPL-3
 SLOT=2
 SRC_URI=http://www.clustal.org/download/current/clustalw-2.1.tar.gz
-_md5_=078e4a54327e77b480d59f01fc098b5c
+_md5_=a6346b517a145259e79462a4ad2187e3
diff --git a/metadata/md5-cache/sci-biology/clustalx-2.1 b/metadata/md5-cache/sci-biology/clustalx-2.1
index 375d2b85d806..e9a691a223f1 100644
--- a/metadata/md5-cache/sci-biology/clustalx-2.1
+++ b/metadata/md5-cache/sci-biology/clustalx-2.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4
 DESCRIPTION=Graphical interface for the ClustalW multiple alignment program
 EAPI=4
 HOMEPAGE=http://www.ebi.ac.uk/tools/clustalw2/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 >=sci-biology/clustalw-2.1
 SLOT=0
 SRC_URI=http://www.clustal.org/download/current/clustalx-2.1.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6c1cca7ab8366ef4c11425eff68a265f
+_md5_=3b5b6a5f103d0c8c6f29c005f8e90cb8
diff --git a/metadata/md5-cache/sci-biology/gatk-1.4 b/metadata/md5-cache/sci-biology/gatk-1.4
index 8cd380372dd8..ef07dbf29af8 100644
--- a/metadata/md5-cache/sci-biology/gatk-1.4
+++ b/metadata/md5-cache/sci-biology/gatk-1.4
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=https://github.com/broadgsa/gatk/tarball/1.4 -> gatk-1.4.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cd897309a71e9c9754604f6271eea0ee
diff --git a/metadata/md5-cache/sci-biology/gatk-1.5 b/metadata/md5-cache/sci-biology/gatk-1.5
index 5d175d282130..bc49c63b5145 100644
--- a/metadata/md5-cache/sci-biology/gatk-1.5
+++ b/metadata/md5-cache/sci-biology/gatk-1.5
@@ -9,5 +9,5 @@ LICENSE=as-is
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=https://github.com/broadgsa/gatk/tarball/1.5 -> gatk-1.5.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b215da5e21e65140b668688acc193c7
diff --git a/metadata/md5-cache/sci-biology/gatk-9999 b/metadata/md5-cache/sci-biology/gatk-9999
index 9e5e7af76f62..256849b06da2 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=as-is
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=82f264d16f4f4f8896417d876c8252b3
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 53ff7357c258..94de481cd4b5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 eac04cbec4d6..eb96c80fa89b 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=54ba893de1536071160ba9dfd3b56093
diff --git a/metadata/md5-cache/sci-biology/mauve-9999 b/metadata/md5-cache/sci-biology/mauve-9999
index 218ee9d1e5d4..a73768cdb64c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ff36d81e55c44a5a698560c938a8f0ef
diff --git a/metadata/md5-cache/sci-biology/picard-1.58 b/metadata/md5-cache/sci-biology/picard-1.58
index a47d92006f1f..cd497513b617 100644
--- a/metadata/md5-cache/sci-biology/picard-1.58
+++ b/metadata/md5-cache/sci-biology/picard-1.58
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c1551001e008385c46e51119d70864bd
diff --git a/metadata/md5-cache/sci-biology/picard-1.63 b/metadata/md5-cache/sci-biology/picard-1.63
index 1a7a51a81b97..3e456b188437 100644
--- a/metadata/md5-cache/sci-biology/picard-1.63
+++ b/metadata/md5-cache/sci-biology/picard-1.63
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a092c5cbfd0730b1a681bb4c31fff4d3
diff --git a/metadata/md5-cache/sci-biology/readseq-20080420 b/metadata/md5-cache/sci-biology/readseq-20080420
index 04c9c1c44107..7cfdee358f96 100644
--- a/metadata/md5-cache/sci-biology/readseq-20080420
+++ b/metadata/md5-cache/sci-biology/readseq-20080420
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-java/xerces:2 dev-java/jaxp >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dberkholz/distfiles/readseq-source-20080420.zip
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=456bcea7a017371949760b8aa2c4b708
diff --git a/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1 b/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1
deleted file mode 100644
index 08e1d96624e8..000000000000
--- a/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Software for improvement and interpretation of crystallographic electron density maps
-EAPI=3
-HOMEPAGE=http://www.embl-hamburg.de/ARP/
-KEYWORDS=-* amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=ArpWarp
-RDEPEND=app-shells/tcsh sci-chemistry/refmac sys-apps/gawk virtual/jre virtual/opengl x11-libs/libX11 =dev-lang/python-2*
-RESTRICT=fetch
-SLOT=0
-SRC_URI=arp_warp_7.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e32b0d3bfc4f3bf8279cd2d5d94e42b6
diff --git a/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1-r1 b/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1-r1
index 8f081feca562..bd322f7ac625 100644
--- a/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1-r1
+++ b/metadata/md5-cache/sci-chemistry/arp-warp-bin-7.1-r1
@@ -10,4 +10,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=arp_warp_7.1.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9d2864bceadf9e18b541412b2492eeef
+_md5_=30889ecd467ee193000272c94adccb9d
diff --git a/metadata/md5-cache/sci-chemistry/dssp-2.0.4 b/metadata/md5-cache/sci-chemistry/dssp-2.0.4
new file mode 100644
index 000000000000..1b63a58938f2
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/dssp-2.0.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=The protein secondary structure standard
+EAPI=4
+HOMEPAGE=http://swift.cmbi.ru.nl/gv/dssp/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+SLOT=0
+SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/dssp-2.0.4.tgz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=b7de2f5350dc1fa5e48af4deff2aa151
diff --git a/metadata/md5-cache/sci-chemistry/jmol-11.0.3-r1 b/metadata/md5-cache/sci-chemistry/jmol-11.0.3-r1
index e6853ed68839..25ec9598dba2 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-11.0.3-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-11.0.3-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 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/jmol-11.0.3-full.tar.gz http://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=5c9e79823e51c7dafe99104290b5903a
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.0.45 b/metadata/md5-cache/sci-chemistry/jmol-12.0.45
index 61e6f52cc88e..8f0d6124b4ac 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.0.45
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.0.45
@@ -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 >=sys-apps/portage-2.1.2.7
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=5121ea2ff7dc630c45b4c7ef8df939a0
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.2.27 b/metadata/md5-cache/sci-chemistry/jmol-12.2.27
index f9dab574b410..20c4e4429502 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.2.27
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.2.27
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli dev-java/itext:0 sci-libs/jmol-acme sci-libs/vecmath-objectclub sci-libs/naga >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
 _md5_=6c03967c756bbf9316d4618ec6d9d348
diff --git a/metadata/md5-cache/sci-chemistry/pymol-1.3.1_pre3925-r1 b/metadata/md5-cache/sci-chemistry/pymol-1.3.1_pre3925-r1
index 46cef8ee857b..26345051dd9c 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-1.3.1_pre3925-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-1.3.1_pre3925-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Python-extensible molecular graphics system
 EAPI=3
 HOMEPAGE=http://pymol.sourceforge.net/
 IUSE=apbs numpy shaders vmd
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2.2
 RDEPEND=dev-python/numpy dev-python/pmw media-libs/freetype:2 media-libs/libpng media-video/mpeg-tools sys-libs/zlib media-libs/freeglut apbs? ( dev-libs/maloc sci-chemistry/apbs sci-chemistry/pdb2pqr sci-chemistry/pymol-apbs-plugin ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[tk] =dev-lang/python-2.6*[tk] )
 SLOT=0
 SRC_URI=mirror://gentoo/pymol-1.3.1_pre3925-r1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4cb3e9bdfcd12192fb1e6d7a18039e3c
+_md5_=f898116b77b8bdb8d5d5faf35018a2cc
diff --git a/metadata/md5-cache/sci-chemistry/scala-3.3.18-r2 b/metadata/md5-cache/sci-chemistry/scala-3.3.18-r2
index 3370bbe1426d..f390c3bfc13e 100644
--- a/metadata/md5-cache/sci-chemistry/scala-3.3.18-r2
+++ b/metadata/md5-cache/sci-chemistry/scala-3.3.18-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.
 DESCRIPTION=Scale together multiple observations of reflections
 EAPI=2
 HOMEPAGE=http://www.ccp4.ac.uk/dist/html/scala.html
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ccp4
 RDEPEND=virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2
 SLOT=0
 SRC_URI=ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.18.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fortran-2	368b82ae80c1184988a9d651e6efcbd0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a9bb306fec29205332f6bfef64634b6c
+_md5_=e9d83cb57064920d211ed9dc1e368c27
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index ef7962dd35fa..8e99313e5973 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ede23ed32c70680c331b0e3d1794eb72
diff --git a/metadata/md5-cache/sci-electronics/electric-8.10 b/metadata/md5-cache/sci-electronics/electric-8.10
index 5576f98691e2..47ec60a236f9 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6c974d43593aa5a44388d7618b82c826
diff --git a/metadata/md5-cache/sci-electronics/electric-8.11 b/metadata/md5-cache/sci-electronics/electric-8.11
index 24e7a17f312d..6f1d1b50329f 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6976ebf8a40c32d033835f04a2527909
diff --git a/metadata/md5-cache/sci-electronics/electric-9.00 b/metadata/md5-cache/sci-electronics/electric-9.00
index 51c7154babe7..01248837dcff 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e13299d57501249c6a1327c2b98c55ba
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.0.3 b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
index 496e6ff8c930..51e08b6f1441 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c22d0243b21d1037c7ae1ff4352c3036
diff --git a/metadata/md5-cache/sci-geosciences/josm-4203 b/metadata/md5-cache/sci-geosciences/josm-4203
index 35c7df08f53f..44d1e756afcf 100644
--- a/metadata/md5-cache/sci-geosciences/josm-4203
+++ b/metadata/md5-cache/sci-geosciences/josm-4203
@@ -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-4203.tar.xz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=46c36a0902eda1c52410a282f48cdbd9
diff --git a/metadata/md5-cache/sci-geosciences/josm-4550 b/metadata/md5-cache/sci-geosciences/josm-4550
index d51340919f52..a5ab55bfd466 100644
--- a/metadata/md5-cache/sci-geosciences/josm-4550
+++ b/metadata/md5-cache/sci-geosciences/josm-4550
@@ -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-4550.tar.xz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1e22475eca3c27ea17d826709790afcf
diff --git a/metadata/md5-cache/sci-geosciences/josm-9999 b/metadata/md5-cache/sci-geosciences/josm-9999
index b6636715f7a6..93cbc913eff1 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.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4cf2fcb35a99b0dbabb36598ccabe51
diff --git a/metadata/md5-cache/sci-geosciences/mkgmap-1995 b/metadata/md5-cache/sci-geosciences/mkgmap-1995
index 7221486ce171..983186b156fe 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _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 521c15616e16..28d5fe6225e2 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f04c90fd8e32538755528b4115379f89
diff --git a/metadata/md5-cache/sci-libs/jmol-acme-1.0 b/metadata/md5-cache/sci-libs/jmol-acme-1.0
index de87205a705c..353f0a49137c 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af104e194669d46f851f81bcf6e6e54e
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index 1980814e62cc..3cfda6010142 100644
--- a/metadata/md5-cache/sci-libs/naga-2.1
+++ b/metadata/md5-cache/sci-libs/naga-2.1
@@ -8,5 +8,5 @@ KEYWORDS=~x86 ~amd64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6307861224f016196eed321b2e43344f
diff --git a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14 b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
index d1106e8862e3..582af410e2d5 100644
--- a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
+++ b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bfa69ffd7e3dfdcc9e26390977e51727
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r1 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r1
index 2cd330a6507d..ac95280aec93 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl 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
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2011-1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b42b0b1446a704211f227c9e49a49dc
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2012 b/metadata/md5-cache/sci-mathematics/isabelle-2012
index b5468fdec634..7f89291bf13a 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2012
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2012
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl 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
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=40081b453e28130ce07c535e29f2f002
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1 b/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
index 37eb1a888027..c6f8554b2967 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=3
 HOMEPAGE=http://www.singular.uni-kl.de/
 IUSE=boost doc emacs examples python +readline test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc ~x86 ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-4/Singular-3-1-4-share.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3b489b816263890f4ce441ff467557d1
+_md5_=a286c8d6624e9d68ddccbeed89702e6c
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 205487196965..f6ed0e62d75e 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d85371a89699bef975a3a483b54d37e2
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 5c083174645e..20adef5204c2 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
@@ -8,5 +8,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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fdd79549d7a7e4da80833b239d131493
diff --git a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1 b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1
index cf5c6d10974d..70d6c80c92bd 100644
--- a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1
+++ b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1
@@ -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/jaxodraw/jaxodraw-2.0-1_src.tar.gz http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=baf223d7b836da5607cfd0df13307db3
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
index c06700893834..733c127f452a 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=67a5c56fc80db896cd963021882eafe1
diff --git a/metadata/md5-cache/sys-apps/hotplug-20040923-r1 b/metadata/md5-cache/sys-apps/hotplug-20040923-r1
index 16a29efef340..ccc50edbc5ab 100644
--- a/metadata/md5-cache/sys-apps/hotplug-20040923-r1
+++ b/metadata/md5-cache/sys-apps/hotplug-20040923-r1
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9 sys-apps/hotplug-base
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/hotplug-2004_09_23.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4e53ff770b72a45ac9c3e09600ccbfda
+_md5_=78c87bd34f336bac84612e67b7c8e70f
diff --git a/metadata/md5-cache/sys-apps/hotplug-20040923-r2 b/metadata/md5-cache/sys-apps/hotplug-20040923-r2
index b298153f49cc..a4b05171209d 100644
--- a/metadata/md5-cache/sys-apps/hotplug-20040923-r2
+++ b/metadata/md5-cache/sys-apps/hotplug-20040923-r2
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9 sys-apps/hotplug-base
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/hotplug-2004_09_23.tar.gz
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=807117b12b8933d92254cdc27c889f51
+_md5_=773311304c71e6edd3c485d7299916a2
diff --git a/metadata/md5-cache/sys-apps/nawk-20110810 b/metadata/md5-cache/sys-apps/nawk-20110810
new file mode 100644
index 000000000000..c8c3d83afd70
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nawk-20110810
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=virtual/yacc
+DESCRIPTION=Brian Kernighan's pattern scanning and processing language
+EAPI=4
+HOMEPAGE=http://cm.bell-labs.com/cm/cs/awkbook/index.html
+KEYWORDS=~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz
+_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=b85ab768475df5fd645873567e635341
diff --git a/metadata/md5-cache/sys-cluster/gearmand-0.33 b/metadata/md5-cache/sys-cluster/gearmand-0.33
new file mode 100644
index 000000000000..41b45caa3974
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/gearmand-0.33
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=dev-libs/libevent || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) tcmalloc? ( dev-util/google-perftools ) memcache? ( >=dev-libs/libmemcached-0.47 ) drizzle? ( dev-db/drizzle ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) postgres? ( >=dev-db/postgresql-base-9.0 )
+DESCRIPTION=Generic framework to farm out work to other machines
+EAPI=4
+HOMEPAGE=http://www.gearman.org/
+IUSE=debug tcmalloc +memcache drizzle sqlite tokyocabinet postgres
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevent || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) tcmalloc? ( dev-util/google-perftools ) memcache? ( >=dev-libs/libmemcached-0.47 ) drizzle? ( dev-db/drizzle ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) postgres? ( >=dev-db/postgresql-base-9.0 )
+SLOT=0
+SRC_URI=http://launchpad.net/gearmand/trunk/0.33/+download/gearmand-0.33.tar.gz
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=772dc075ed2c51e9e9b07107fb4b3e02
diff --git a/metadata/md5-cache/sys-devel/crossdev-20120305 b/metadata/md5-cache/sys-devel/crossdev-20120305
index 9379feff19a1..c41697e88f3b 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20120305
+++ b/metadata/md5-cache/sys-devel/crossdev-20120305
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 app-shells/bash !sys-devel/crossdev-wrappers
 SLOT=0
 SRC_URI=mirror://gentoo/crossdev-20120305.tar.xz http://dev.gentoo.org/~vapier/dist/crossdev-20120305.tar.xz
-_md5_=01a8b441d403484d8c4349ae22b14f8c
+_md5_=cf8b099df8326b5ded4e961d084b9607
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index e0f39d73d916..721f2988b4fb 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	c32743dcc2bb13eb5fa77cc78ecca450	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c480af5b2301820b237e0c89b6ed3054
+_md5_=8bcac59663fc2879302b18c25cf6716b
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.6 b/metadata/md5-cache/sys-devel/gcc-config-1.6
index 2802975daf1f..e59050e7f620 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.6
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=utility to manage compilers
 HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.6.tar.xz http://dev.gentoo.org/~vapier/dist/gcc-config-1.6.tar.xz
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	unpacker	e1b907c6a72dc4c9025109f3e84129c7
-_md5_=81338635ef67ffcc1bb192f84e621d1c
+_md5_=efc7fa783c9adcab31bee25288819d26
diff --git a/metadata/md5-cache/sys-devel/sparse-0.4.3 b/metadata/md5-cache/sys-devel/sparse-0.4.3
index 43eb64ce81eb..b073f5687b10 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.4.3
+++ b/metadata/md5-cache/sys-devel/sparse-0.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=C semantic parser
 EAPI=2
 HOMEPAGE=http://sparse.wiki.kernel.org/index.php/Main_Page
 IUSE=gtk xml test
-KEYWORDS=~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=OSL-1.1
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.4.3.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=eec3e5ad8a3c548c7fab6b8e8055d68e
+_md5_=ce3f19ecf6164b12cc70addc3a0ae82e
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 2eb901b77598..63474c6bdba4 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
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d65e738426104507a7f400b788074db9
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 c905c58f1cac..fc0b042cba0b 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
@@ -8,5 +8,5 @@ LICENSE=as-is
 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	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3df68dc49abc5a519ef74a28e5cb61de
diff --git a/metadata/md5-cache/sys-fs/s3ql-1.10 b/metadata/md5-cache/sys-fs/s3ql-1.10
deleted file mode 100644
index 0fcb285ee91d..000000000000
--- a/metadata/md5-cache/sys-fs/s3ql-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse test? ( net-misc/rsync[xattr] dev-python/unittest2 ) =dev-lang/python-2*
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=4
-HOMEPAGE=http://code.google.com/p/s3ql/
-IUSE=contrib doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://s3ql.googlecode.com/files/s3ql-1.10.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=fae7c39fce62e6a0864977cc74b5cea7
diff --git a/metadata/md5-cache/sys-fs/s3ql-1.11 b/metadata/md5-cache/sys-fs/s3ql-1.11
deleted file mode 100644
index ba10ebc33e5a..000000000000
--- a/metadata/md5-cache/sys-fs/s3ql-1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse test? ( net-misc/rsync[xattr] dev-python/unittest2 ) =dev-lang/python-2*
-DESCRIPTION=A full-featured file system for online data storage
-EAPI=4
-HOMEPAGE=http://code.google.com/p/s3ql/
-IUSE=contrib doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools >=dev-python/apsw-3.7.0 >=dev-python/llfuse-0.37 dev-python/pycryptopp dev-python/pyliblzma || ( >=dev-lang/python-2.7 dev-python/argparse ) sys-fs/fuse =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://s3ql.googlecode.com/files/s3ql-1.11.tar.bz2
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=a443a39bfb7c6e664dba30a2cfe26e0d
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.24_p1 b/metadata/md5-cache/sys-kernel/genkernel-3.4.24_p1
index 2a6cfd201e96..359637f32a29 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.24_p1
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.24_p1
@@ -3,10 +3,10 @@ DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 HOMEPAGE=http://www.gentoo.org
 IUSE=ibm selinux
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) app-arch/cpio
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.4.24_p1.tar.bz2 http://wolf31o2.org/sources/genkernel/genkernel-3.4.24_p1.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc14.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc14.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/dm/device-mapper.1.02.22.tgz ftp://sources.redhat.com/pub/dm/old/device-mapper.1.02.22.tgz http://www.busybox.net/downloads/busybox-1.19.3.tar.bz2 mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-2.0-872.tar.gz mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=112b5b34db2f8f685c1da7a120231da1
+_md5_=0ab2c50081acb3c1c232e59ea5f00689
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1 b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1
new file mode 100644
index 000000000000..b04ec8f5a4f2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.5_rc1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=4
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RESTRICT=binchecks strip
+SLOT=3.5_rc1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.5-rc1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2666303516644f07c41dca2a304f735a
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20120502 b/metadata/md5-cache/sys-kernel/linux-firmware-20120502
index c9af63741b90..846584ac4eac 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20120502
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20120502
@@ -3,10 +3,10 @@ DESCRIPTION=Linux firmware files
 EAPI=4
 HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~x86
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
 RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
 SLOT=0
 SRC_URI=mirror://gentoo/linux-firmware-20120502.tar.xz
 _eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=2f4f24fc904140c9ec32e4c83fcc95a0
+_md5_=e5d42b65d834724650e5b8e688b72d11
diff --git a/metadata/md5-cache/sys-power/nut-2.6.3 b/metadata/md5-cache/sys-power/nut-2.6.3
index afff59e55c97..f1f0555d7ed7 100644
--- a/metadata/md5-cache/sys-power/nut-2.6.3
+++ b/metadata/md5-cache/sys-power/nut-2.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network-UPS Tools
 EAPI=2
 HOMEPAGE=http://www.networkupstools.org/
 IUSE=avahi cgi snmp usb ssl tcpd xml bash-completion
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=avahi? ( net-dns/avahi ) cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 bash-completion? ( app-admin/eselect )
 SLOT=0
 SRC_URI=http://random.networkupstools.org/source/2.6/nut-2.6.3.tar.gz http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	bash-completion	003731da0df19d26955927bd534f3058	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f843163fdaae71f68192eaeb1a43c5d0
+_md5_=cf58ca0b25db1c600ce181fdb3b76af1
diff --git a/metadata/md5-cache/sys-process/time-1.7-r1 b/metadata/md5-cache/sys-process/time-1.7-r1
index 8726c9a3509d..7c2c32625e58 100644
--- a/metadata/md5-cache/sys-process/time-1.7-r1
+++ b/metadata/md5-cache/sys-process/time-1.7-r1
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install unpack
-DEPEND=|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEFINED_PHASES=prepare
+DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=displays info about resources used by a program
+EAPI=4
 HOMEPAGE=http://www.gnu.org/directory/time.html
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/time/time-1.7.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=25222db14057aadd097b9190b43bbb00
+_md5_=0e58edc5516d83dc1e949602ea1b45eb
diff --git a/metadata/md5-cache/virtual/awk-0 b/metadata/md5-cache/virtual/awk-0
new file mode 100644
index 000000000000..443c348eb625
--- /dev/null
+++ b/metadata/md5-cache/virtual/awk-0
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for awk implementation
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+RDEPEND=|| ( sys-apps/gawk sys-apps/mawk sys-apps/nawk sys-apps/busybox )
+SLOT=0
+_md5_=91bab72da476019c4e7efc698cc3fb25
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 5276de247f09..d15bc982e959 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	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=237dca4746f7b856e9b0dc227fd05b89
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 0fe1442687b8..893e0beb7413 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	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f4eabc33e31aac8b54a1a2470dca0119
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 b547f2797ca7..165f079f9b48 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	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6ab7622961fce3b1918c4e4984c81e2
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1155.2 b/metadata/md5-cache/www-client/chromium-21.0.1155.2
index 51360634d2bf..76ee2a478cd9 100644
--- a/metadata/md5-cache/www-client/chromium-21.0.1155.2
+++ b/metadata/md5-cache/www-client/chromium-21.0.1155.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1155.2.tar.bz2
 _eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=185817be8cb8c862dd497761b4ffe4d1
+_md5_=af4ad7dbc170ded0cb020daa88935558
diff --git a/metadata/md5-cache/www-servers/axis-1.4-r1 b/metadata/md5-cache/www-servers/axis-1.4-r1
index b7412972ed06..685f183a86b5 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	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e22dd2eb6bd58e3de77a100b7fe265dd
diff --git a/metadata/md5-cache/www-servers/resin-4.0.13-r1 b/metadata/md5-cache/www-servers/resin-4.0.13-r1
index 17c654501a1b..110aaf4abd97 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.13-r1
+++ b/metadata/md5-cache/www-servers/resin-4.0.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.13 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.13-src.zip mirror://gentoo/resin-gentoo-patches-4.0.13.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99b03e9bcf4aea87aa1a23f0c2f4abd8
diff --git a/metadata/md5-cache/www-servers/resin-4.0.14 b/metadata/md5-cache/www-servers/resin-4.0.14
index 950395d7c104..84b8b77abdcb 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.14
+++ b/metadata/md5-cache/www-servers/resin-4.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.14 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.14-src.zip mirror://gentoo/resin-gentoo-patches-4.0.14.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49c67a03676c80aa6df72e9a5a31d872
diff --git a/metadata/md5-cache/www-servers/resin-4.0.15 b/metadata/md5-cache/www-servers/resin-4.0.15
index 3ffd2992e338..a1879292277a 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.15
+++ b/metadata/md5-cache/www-servers/resin-4.0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.15 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.15-src.zip mirror://gentoo/resin-gentoo-patches-4.0.15.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c8e409c48214088fa9f9b488f38a0433
diff --git a/metadata/md5-cache/www-servers/resin-4.0.22 b/metadata/md5-cache/www-servers/resin-4.0.22
index 0419d6230b72..edb192ee9404 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=03b5b03a14975f7285d6bf1a0579de4f
diff --git a/metadata/md5-cache/www-servers/resin-4.0.25 b/metadata/md5-cache/www-servers/resin-4.0.25
index 73a2f930cd8d..1b3f4135e399 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48ac1aebdf65dd952bad2564ca6fbe2d
diff --git a/metadata/md5-cache/www-servers/resin-4.0.26 b/metadata/md5-cache/www-servers/resin-4.0.26
index 6ddc1aeeaa16..5b8d3d89e2ce 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	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf4a449356c5ebec0bb6a754a430fd1f
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.35 b/metadata/md5-cache/www-servers/tomcat-6.0.35
index 86458137fbf1..ac53ff175b96 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.35
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.35
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.5 >=dev-java/commons-daemon-1.0.1 dev-java/ant-core dev-java/eclipse-ecj:3.3 dev-java/ant-eclipse-ecj:3.3 >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 ~dev-java/tomcat-servlet-api-6.0.35 examples? ( dev-java/jakarta-jstl ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.35/src/apache-tomcat-6.0.35-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=907518015422390f91ab9fb5570a84fd
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.23-r3 b/metadata/md5-cache/www-servers/tomcat-7.0.23-r3
index 068caeded79c..435f119c8f94 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.23-r3
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.23-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.6 >=dev-java/commons-daemon-1.0.3 dev-java/ant-core dev-java/eclipse-ecj:3.7 dev-java/ant-eclipse-ecj:3.7 >=dev-java/commons-dbcp-1.4 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.5.5 ~dev-java/tomcat-servlet-api-7.0.23 examples? ( dev-java/jakarta-jstl ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.23/src/apache-tomcat-7.0.23-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6413762b650a444943b571b84b576973
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.26 b/metadata/md5-cache/www-servers/tomcat-7.0.26
index 90c39bc0af56..060c91fcb656 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.26
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.26
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.6 >=dev-java/commons-daemon-1.0.9 dev-java/ant-core dev-java/eclipse-ecj:3.7 dev-java/ant-eclipse-ecj:3.7 >=dev-java/commons-dbcp-1.4 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.5.5 ~dev-java/tomcat-servlet-api-7.0.26 examples? ( dev-java/jakarta-jstl ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.26/src/apache-tomcat-7.0.26-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dee49c4c762ba5c58aaf0dad89df9864
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.27 b/metadata/md5-cache/www-servers/tomcat-7.0.27
index c279461bdfa1..00f39c1e3272 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.27
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.27
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
 EAPI=2
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=!<dev-java/tomcat-native-1.1.20 >=virtual/jre-1.6 >=dev-java/commons-daemon-1.0.9 dev-java/ant-core dev-java/eclipse-ecj:3.7 dev-java/ant-eclipse-ecj:3.7 >=dev-java/commons-dbcp-1.4 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.5.5 ~dev-java/tomcat-servlet-api-7.0.27 examples? ( dev-java/jakarta-jstl ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.27/src/apache-tomcat-7.0.27-src.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7d1c6e852713180d5f5f60d4ff0fcb96
+_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6c9c6ec6371da6ef6c40d64cecb0392a
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r1 b/metadata/md5-cache/x11-base/xorg-server-1.10.6-r1
index 05e52c38c984..52eb71582c87 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.10.6-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.10.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.10 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.10.6.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	7bd9188561818b742702e8b7b21fd8d3	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=6e5924fa58b70321b3ddcdea466b851a
+_md5_=76761ba86cb5c4ce00e5a9afe5c58be4
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r1 b/metadata/md5-cache/x11-base/xorg-server-1.11.4-r1
index f459d8ae5983..b6b271324754 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.11.4-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.11.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.11 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.4.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	7bd9188561818b742702e8b7b21fd8d3	eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=e58caaeddae769394ba74458509a0a00
+_md5_=f1a6198a93b083fbebf3b9ef98cee990
diff --git a/metadata/md5-cache/x11-libs/libfakekey-0.1-r1 b/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
index ace5e85d4ecf..aa9375cabdad 100644
--- a/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
+++ b/metadata/md5-cache/x11-libs/libfakekey-0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library for the x11-misc/matchbox-keyboard package.
 EAPI=2
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/libfakekey/0.1/libfakekey-0.1.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=817c939e258eaf897f02cd326d96434d
+_md5_=776c20ff1c03530ac44029a59c6224b1
diff --git a/metadata/md5-cache/x11-libs/libmatchbox-1.9-r1 b/metadata/md5-cache/x11-libs/libmatchbox-1.9-r1
index 0a4b565ff7db..218fed0654ee 100644
--- a/metadata/md5-cache/x11-libs/libmatchbox-1.9-r1
+++ b/metadata/md5-cache/x11-libs/libmatchbox-1.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Matchbox Library.
 EAPI=4
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug doc jpeg pango png static-libs test truetype X xsettings
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext truetype? ( x11-libs/libXft ) pango? ( x11-libs/pango ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) xsettings? ( x11-libs/libxsettings-client )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4490a4eef0e1e0c5e0d4c7ff2c0816c7
+_md5_=422ec20fd8f9b9768a847a69d7455056
diff --git a/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1 b/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1
index 09c703ddbfbb..4ae0ca692f2c 100644
--- a/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1
+++ b/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard.
 EAPI=2
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug cairo
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libfakekey cairo? ( x11-libs/cairo[X] ) !cairo? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3dc4523fef3822dff061cc13c55fe6ff
+_md5_=56bc50acc37ec7d1c4b245fc85dfbc25
diff --git a/metadata/md5-cache/x11-misc/matchbox-panel-manager-0.1 b/metadata/md5-cache/x11-misc/matchbox-panel-manager-0.1
index 4d803dcbe1bc..661b2449e6d3 100644
--- a/metadata/md5-cache/x11-misc/matchbox-panel-manager-0.1
+++ b/metadata/md5-cache/x11-misc/matchbox-panel-manager-0.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/gtk+:2
 DESCRIPTION=Matchbox panel configuration utility.
 EAPI=1
 HOMEPAGE=http://matchbox-project.org/
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/gtk+:2 x11-wm/matchbox-panel
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-panel-manager/0.1/matchbox-panel-manager-0.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=604469599d0c10af862dec7b1a86f9aa
+_md5_=09b5eef1c2b53a61942c9bc8aecf5c1e
diff --git a/metadata/md5-cache/x11-plugins/asmon-0.71 b/metadata/md5-cache/x11-plugins/asmon-0.71
index a3bb3c38d8e2..52fe0296be84 100644
--- a/metadata/md5-cache/x11-plugins/asmon-0.71
+++ b/metadata/md5-cache/x11-plugins/asmon-0.71
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-proto/xextproto
 DESCRIPTION=WindowMaker/AfterStep system monitor dockapp
 HOMEPAGE=http://rio.vg/asmon
-KEYWORDS=alpha ~amd64 ppc sparc x86
+KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11
 SLOT=0
 SRC_URI=http://rio.vg/asmon/asmon-0.71.tar.bz2
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=5dfd83255d267b5add3983c8636d66ee
+_md5_=5946aea69c911c7ce1b7caf0f142a5fa
diff --git a/metadata/md5-cache/x11-plugins/matchbox-applet-input-manager-0.6 b/metadata/md5-cache/x11-plugins/matchbox-applet-input-manager-0.6
index f9b02a3d8156..0bc59cebb9c3 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-applet-input-manager-0.6
+++ b/metadata/md5-cache/x11-plugins/matchbox-applet-input-manager-0.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5
 DESCRIPTION=Matchbox panel tray app for managing software input methods.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 x11-wm/matchbox-panel
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-applet-input-manager/0.6/mb-applet-input-manager-0.6.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8f9520b2ee9f93044dc7a5320ac46eae
+_md5_=b5803dd41600e57d72c00b9438160e2c
diff --git a/metadata/md5-cache/x11-plugins/matchbox-applet-startup-monitor-0.1 b/metadata/md5-cache/x11-plugins/matchbox-applet-startup-monitor-0.1
index a7aaf3982638..e8b94a3a4cfe 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-applet-startup-monitor-0.1
+++ b/metadata/md5-cache/x11-plugins/matchbox-applet-startup-monitor-0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/startup-notification
 DESCRIPTION=Startup notification matchbox panel tray app.
 HOMEPAGE=http://matchbox-project.org/
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/startup-notification x11-wm/matchbox-panel
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5340a8d9fb84c52b52dd8e8be8b77bf7
+_md5_=09ead58945836deb5ceac3dac4732b27
diff --git a/metadata/md5-cache/x11-plugins/matchbox-applet-volume-0.1 b/metadata/md5-cache/x11-plugins/matchbox-applet-volume-0.1
index d791072964b2..59091203f1ea 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-applet-volume-0.1
+++ b/metadata/md5-cache/x11-plugins/matchbox-applet-volume-0.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/gtk+:2
 DESCRIPTION=Matchbox panel tray app for controlling volume levels.
 EAPI=1
 HOMEPAGE=http://matchbox-project.org/
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 x11-libs/gtk+:2 x11-wm/matchbox-panel
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-applet-volume/0.1/mb-applet-volume-0.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=99ac5589bf7628ed27d71f74c41b0273
+_md5_=4e0b13406c7319a39ec75cb30b7fe605
diff --git a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2 b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
index ca78f77b92d2..40c24b137349 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
+++ b/metadata/md5-cache/x11-plugins/matchbox-desktop-image-browser-0.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop || ( >=sys-devel/autom
 DESCRIPTION=An alpha-ish image browser plug in for matchbox-desktop.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-desktop-image-browser/0.2/mb-desktop-image-browser-0.2.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a551b2da3c11f2df43c8d84642ed28fe
+_md5_=fe102b4855f7f1421e4689fcd4bf081a
diff --git a/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4 b/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
index 2133422356eb..39d7cc34fc42 100644
--- a/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
+++ b/metadata/md5-cache/x11-plugins/matchbox-desktop-xine-0.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop >=media-libs/xine-lib-
 DESCRIPTION=A matchbox-desktop plugin that allows you to browse and play media.
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1 x11-wm/matchbox-desktop >=media-libs/xine-lib-1.0.0
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/mb-desktop-xine/0.4/mb-desktop-xine-0.4.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b7c42824637722e8ff907d6b99f023f7
+_md5_=3831867ff1224cf295a1e41c3c548abc
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.4 b/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.4
deleted file mode 100644
index d306921a49ae..000000000000
--- a/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-2.6:2 >=x11-misc/icon-naming-utils-0.8.1 virtual/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
-DESCRIPTION=Nimbus GTK+ Engine from Sun JDS
-EAPI=2
-HOMEPAGE=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
-KEYWORDS=amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.6:2
-SLOT=0
-SRC_URI=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.4.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=f1148e3a8443fbbc956d7f5360644beb
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.7 b/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.7
deleted file mode 100644
index 7a61f71fd83d..000000000000
--- a/metadata/md5-cache/x11-themes/gtk-engines-nimbus-0.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:2 >=x11-misc/icon-naming-utils-0.8.1 virtual/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
-DESCRIPTION=A GTK+-2 engine, icon and metacity themes from Sun JDS
-EAPI=4
-HOMEPAGE=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=a4b3a798f36c4dc3294841f573c5a282
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2 b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2
deleted file mode 100644
index 9d2b190a82d7..000000000000
--- a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=a derivative of the standard Clearlooks engine, using a more orange approach
-EAPI=2
-HOMEPAGE=http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-11.diff.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dd20999869702a23dcc58c8a8e7979e0
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3 b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
index ba039397aa0a..cfb0cc38c9fe 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+++ b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=a derivative of the standard Clearlooks engine, using a more orange approach
-EAPI=2
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A derivative of the standard Clearlooks GTK+ 2.x engine with more orange approach
+EAPI=4
 HOMEPAGE=http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
 KEYWORDS=amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.8:2
+RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-12.diff.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c1ecf75895b2270b44e25a48c778fafe
+_md5_=e302d690afb3739b90c530f5ac23ef47
diff --git a/metadata/md5-cache/x11-themes/matchbox-themes-extra-0.3 b/metadata/md5-cache/x11-themes/matchbox-themes-extra-0.3
index fd93ecd2916c..0125cfd5d517 100644
--- a/metadata/md5-cache/x11-themes/matchbox-themes-extra-0.3
+++ b/metadata/md5-cache/x11-themes/matchbox-themes-extra-0.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DEPEND=x11-wm/matchbox-window-manager
 DESCRIPTION=Extra themes for the matchbox window manager
 HOMEPAGE=http://matchbox-project.org/
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-wm/matchbox-window-manager
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-themes-extra/0.3/matchbox-themes-extra-0.3.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=16137228fe520452e71464bbee9af584
+_md5_=d001c5b1b80d2b81a385d084304fdb4a
diff --git a/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1 b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
new file mode 100644
index 000000000000..0b47ef78e1b6
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=gtk? ( x11-libs/gtk+:2 ) dev-util/intltool virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90 !gtk? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
+DESCRIPTION=The default OpenSolaris theme (GTK+ 2.x engine, icon- and metacity theme)
+EAPI=4
+HOMEPAGE=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/
+IUSE=gtk minimal
+KEYWORDS=amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) !minimal? ( || ( x11-themes/gnome-icon-theme x11-themes/tango-icon-theme ) )
+SLOT=0
+SRC_URI=http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=43333d7add3d9efe744015bf80e9a247
diff --git a/metadata/md5-cache/x11-wm/matchbox-0.7.1 b/metadata/md5-cache/x11-wm/matchbox-0.7.1
deleted file mode 100644
index d16f908b1a94..000000000000
--- a/metadata/md5-cache/x11-wm/matchbox-0.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft dev-libs/expat x11-libs/startup-notification x11-libs/libxsettings-client png? ( >=media-libs/libpng-1.4 ) jpeg? ( virtual/jpeg ) x11-proto/xproto x11-proto/xextproto sys-devel/libtool
-DESCRIPTION=Light weight WM designed for use on PDA computers
-HOMEPAGE=http://matchbox-project.org/
-IUSE=jpeg png nls debug
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft dev-libs/expat x11-libs/startup-notification x11-libs/libxsettings-client png? ( >=media-libs/libpng-1.4 ) jpeg? ( virtual/jpeg )
-SLOT=0
-SRC_URI=http://handhelds.org/~mallum/downloadables/matchbox-0.7.1.tar.gz
-_eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	flag-o-matic	0be11571741a0d72603cb8cfc58bd3be	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ec3e2fe2ff45caa6f49c9628c96ce7d3
diff --git a/metadata/md5-cache/x11-wm/matchbox-1.0 b/metadata/md5-cache/x11-wm/matchbox-1.0
index bf166c1fb54f..bc82b0b08286 100644
--- a/metadata/md5-cache/x11-wm/matchbox-1.0
+++ b/metadata/md5-cache/x11-wm/matchbox-1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Light weight WM designed for use on PDA computers
 HOMEPAGE=http://matchbox-project.org/
 IUSE=minimal
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=as-is
 RDEPEND=x11-wm/matchbox-common x11-wm/matchbox-desktop x11-wm/matchbox-panel x11-wm/matchbox-window-manager !minimal? ( x11-misc/matchbox-keyboard x11-misc/matchbox-panel-manager x11-themes/matchbox-themes-extra x11-plugins/matchbox-applet-input-manager x11-plugins/matchbox-applet-startup-monitor x11-plugins/matchbox-applet-volume )
 SLOT=0
-_md5_=2e18a69cea44885ac12a0ee39309ad4b
+_md5_=9c03bc0401651402a0512e790bd8cb48
diff --git a/metadata/md5-cache/x11-wm/matchbox-common-0.9.1-r2 b/metadata/md5-cache/x11-wm/matchbox-common-0.9.1-r2
index d322660424a4..756a036fe810 100644
--- a/metadata/md5-cache/x11-wm/matchbox-common-0.9.1-r2
+++ b/metadata/md5-cache/x11-wm/matchbox-common-0.9.1-r2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.1
 DESCRIPTION=Common files used by matchbox-panel and matchbox-desktop packages
 HOMEPAGE=http://matchbox-project.org/
 IUSE=pda
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.1
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0d86ea56f26e4d3d03985999d3648f53
+_md5_=512c7aa24a013a8b7940a44b88970def
diff --git a/metadata/md5-cache/x11-wm/matchbox-desktop-0.9.1 b/metadata/md5-cache/x11-wm/matchbox-desktop-0.9.1
index d8a0bc454303..59b451bd6bdd 100644
--- a/metadata/md5-cache/x11-wm/matchbox-desktop-0.9.1
+++ b/metadata/md5-cache/x11-wm/matchbox-desktop-0.9.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notif
 DESCRIPTION=The Matchbox Desktop
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug dnotify startup-notification
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notification ) x11-wm/matchbox-common
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b5849ea0a330acc2aa0b6d951b82b5b3
+_md5_=99782998400a387d0ccb805efffcc266
diff --git a/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1 b/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
index 0a4c246228d3..05d770176b28 100644
--- a/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
+++ b/metadata/md5-cache/x11-wm/matchbox-panel-0.9.3-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notif
 DESCRIPTION=The Matchbox Panel
 HOMEPAGE=http://matchbox-project.org/
 IUSE=acpi debug dnotify lowres nls startup-notification wifi
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 startup-notification? ( x11-libs/startup-notification ) nls? ( sys-devel/gettext ) wifi? ( net-wireless/wireless-tools ) x11-wm/matchbox-common
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	a95b1bf9d854485ca6fdbb47df2975aa	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c3c1b7fe0a49a9df7e9014bff21a3127
+_md5_=4c60f482b8f2dc625d4ebe07c0cc388e
diff --git a/metadata/md5-cache/x11-wm/matchbox-window-manager-1.2 b/metadata/md5-cache/x11-wm/matchbox-window-manager-1.2
index f7dc17747675..22a52c701e0e 100644
--- a/metadata/md5-cache/x11-wm/matchbox-window-manager-1.2
+++ b/metadata/md5-cache/x11-wm/matchbox-window-manager-1.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libmatchbox-1.5 expat? ( dev-libs/expat ) gnome? ( gnome-base/
 DESCRIPTION=Light weight WM designed for use on PDA computers
 HOMEPAGE=http://matchbox-project.org/
 IUSE=debug expat gnome session startup-notification xcomposite debug
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libmatchbox-1.5 expat? ( dev-libs/expat ) gnome? ( gnome-base/gconf ) startup-notification? ( x11-libs/startup-notification ) session? ( x11-libs/libSM ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2
 _eclasses_=eutils	a95b1bf9d854485ca6fdbb47df2975aa	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6af179e8a5819e742dc779b3f242d759
+_md5_=1ae0cda8496a1402dcc3b9e6e97905b7
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d177ca39094c..8ac247467627 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Jun 2012 15:07:43 +0000
+Mon, 04 Jun 2012 10:07:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5084de9e6e89..b5a6146bada7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jun  3 15:07:41 UTC 2012
+Mon Jun  4 10:07:26 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e36c68114788..587b6249aca7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 03 Jun 2012 15:35:01 +0000
+Mon, 04 Jun 2012 10:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2a162a922266..70a8ea99c497 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1338735901 Sun Jun  3 15:05:01 2012 UTC
+1338804301 Mon Jun  4 10:05:01 2012 UTC
diff --git a/net-analyzer/arpon/arpon-2.7-r1.ebuild b/net-analyzer/arpon/arpon-2.7-r1.ebuild
index b9a0cb1a5788..50ee259c697e 100644
--- a/net-analyzer/arpon/arpon-2.7-r1.ebuild
+++ b/net-analyzer/arpon/arpon-2.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpon/arpon-2.7-r1.ebuild,v 1.1 2012/03/22 21:03:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpon/arpon-2.7-r1.ebuild,v 1.3 2012/06/04 09:54:03 ago Exp $
 
-EAPI="2"
+EAPI="4"
 inherit cmake-utils
 
 DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler."
@@ -10,11 +10,11 @@ DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler."
 MY_PN="ArpON"
 MY_P="${MY_PN}-${PV}"
 HOMEPAGE="http://arpon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arpon/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libdnet
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_install() {
 	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PM}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }
 
diff --git a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
index 76c4e6f1f08e..59f1e5c241b8 100644
--- a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2-r2.ebuild,v 1.1 2012/03/29 04:24:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2-r2.ebuild,v 1.2 2012/06/03 18:32:42 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gspoof.sourceforge.net/"
 SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 IUSE=""
 
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
index d293feb5c036..f8cf91cdaf42 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild,v 1.1 2012/04/22 18:27:19 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild,v 1.2 2012/06/03 18:31:39 ago Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gnome sound"
 
 DEPEND=""
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 26875c9e9cf8..87538c2b518d 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,2 +1,3 @@
 DIST tcpflow-1.0.6.tar.gz 228162 RMD160 77e86cd7496f7e207056ce2139039e1ff125397b SHA1 aa5f57b331be4574440074a919befaca2839afd9 SHA256 0be3f9c07b40b68c22794d249104184b8b4e1b2444aa6e647108f2c5cb582579
 DIST tcpflow-1.2.6.tar.gz 275001 RMD160 b9acb46110c1519f0db1019139a675978a20044e SHA1 4267c491cd5f944f8deba727aa7870ced1ad2224 SHA256 796ec0a677ab4b9656e0b8f86ed7290c9a040f2f2502db52afc709f9c49a19b1
+DIST tcpflow-1.2.7.tar.gz 206141 RMD160 facb2d5383eb69e3bdf7165f842fbcc59de14237 SHA1 e7e71a34afb4d557ebe80e2d589f00d4afd38be4 SHA256 67ebcc4112815b29f5aef074b0aec1f0380bace0c002b97d890c23ad4600890c
diff --git a/net-analyzer/tcpflow/tcpflow-1.2.7.ebuild b/net-analyzer/tcpflow/tcpflow-1.2.7.ebuild
new file mode 100644
index 000000000000..f3becad59c8f
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-1.2.7.ebuild,v 1.1 2012/06/04 09:37:43 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow"
+SRC_URI="mirror://github/simsong/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="net-libs/libpcap
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/coreutils )"
+
+src_prepare() {
+	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
+}
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
index 14ddd0f71574..12a594d9a0df 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.1 2012/03/12 06:56:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.2 2012/06/03 18:29:56 ago Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.fwbuilder.org/"
 SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=x11-libs/qt-gui-4.3
diff --git a/net-ftp/frox/frox-0.7.18-r4.ebuild b/net-ftp/frox/frox-0.7.18-r4.ebuild
index e61fb6dd5991..87ae082e3096 100644
--- a/net-ftp/frox/frox-0.7.18-r4.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r4.ebuild,v 1.1 2012/03/03 12:53:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r4.ebuild,v 1.2 2012/06/03 18:30:25 ago Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -15,7 +15,7 @@ SRC_URI="http://frox.sourceforge.net/download/${MY_P}.tar.bz2"
 HOMEPAGE="http://frox.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 DEPEND="clamav? ( >=app-antivirus/clamav-0.80 )
 	ssl? ( dev-libs/openssl )
diff --git a/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild
index 638b1de323f6..9796542eb219 100644
--- a/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild,v 1.1 2011/12/20 18:13:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.5-r1.ebuild,v 1.2 2012/06/03 18:30:50 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.${PN}.com/${PN}/${P}-src.tar.bz2 -> ${P}.474.tar.bz2"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="sys-libs/ncurses"
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index 0bfcc708aaf7..0be576e2b5d8 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -1,2 +1 @@
-DIST emesene-1.6.3.tar.gz 3078128 RMD160 9037824c713401b33cd7f172ba38f659c7de5f67 SHA1 c4759efe180c8e1589bd966c6b84106aa7cd356e SHA256 9b088a17b4d9d3a2be72737a02dceb7a1a224b978a30b6490fa3354fb49b4bfa
 DIST emesene-2.12.3.tar.gz 10468503 RMD160 327bd5920e28d54aa3bf4fca61092229cce1f309 SHA1 5293f1370fc0b5840c7b3d9ac58f45dcb292a738 SHA256 c0d7d9340e5b1e0d742e025a4260b4623e76bd5bb697892de73c5536514e9c40
diff --git a/net-im/emesene/emesene-1.6.3-r1.ebuild b/net-im/emesene/emesene-1.6.3-r1.ebuild
deleted file mode 100644
index 3680e297140e..000000000000
--- a/net-im/emesene/emesene-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-1.6.3-r1.ebuild,v 1.3 2011/12/13 16:35:57 ago Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit python eutils
-
-DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
-HOMEPAGE="http://www.emesene.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="webcam"
-
-RDEPEND="dev-python/pygtk:2
-	webcam? ( media-plugins/gst-plugins-meta[v4l]
-		dev-python/gst-python
-		media-libs/libmimic )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Workaround problems to connect to servers, bug #389955
-	epatch "${FILESDIR}/${P}-update-servers.patch"
-
-	rm GPL PSF LGPL || die "rm license files failed"
-
-	if ! use webcam; then
-		rm -r libmimic || die "rm libmimic dir failed"
-	fi
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() {
-	if use webcam ; then
-		$(PYTHON) ./setup.py build_ext -i || die "libmimic compile failed"
-	fi
-}
-
-src_install() {
-	if use webcam; then
-		rm -r build || die "rm build failed"
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r * || die "doins failed"
-
-	fperms a+x /usr/share/${PN}/${PN} || die "fperms failed"
-	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "dosym failed"
-
-	doman misc/${PN}.1 || die "doman failed"
-
-	doicon misc/*.{svg,png} || die "doicon failed"
-
-	# install the desktop entry
-	domenu misc/${PN}.desktop || die "domenu failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-
-	elog "If you want to use the spell-checking feature, you should emerge"
-	elog "dev-python/gtkspell-python"
-	elog
-	elog "If you want to use EncryptMessage plugin, you should emerge"
-	elog "dev-python/pexpect"
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/net-im/pidgin/pidgin-2.10.4.ebuild b/net-im/pidgin/pidgin-2.10.4.ebuild
index 6d9db0becd94..2d018a59d19b 100644
--- a/net-im/pidgin/pidgin-2.10.4.ebuild
+++ b/net-im/pidgin/pidgin-2.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.4.ebuild,v 1.4 2012/05/29 12:07:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.4.ebuild,v 1.5 2012/06/03 16:24:30 armin76 Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild b/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
index f6550e6859ad..2247673554bb 100644
--- a/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
+++ b/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild,v 1.1 2012/03/28 13:48:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild,v 1.2 2012/06/03 18:31:15 ago Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://files.ayoy.net/qtwitter/release/${PV}/src/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="x11-libs/libX11
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 350456aaf39c..e69f35c848e9 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -2,4 +2,5 @@ DIST aqbanking-5.0.1.tar.gz 3551295 RMD160 72532b40e1a7bb1130fd151861907e86162c3
 DIST aqbanking-5.0.14.tar.gz 3549299 RMD160 e9b6fb306bf933ccb38cd82fdb25a9d46a0c3ee5 SHA1 7e3d25e1b848087bb94f4084f2846e45ce1d1c24 SHA256 fbd52d3ac712673db2d67a04c9a3d8c07f4180c1591c006fd86ff66c5dfeef06
 DIST aqbanking-5.0.21.tar.gz 3634513 RMD160 78cf75085cd673d098bf0b493f26f2d16f2e7877 SHA1 7f2839e4917776ad2b0c262165600c5b40aedfc1 SHA256 a2dcc73b07c4aff0b43ded6f6f2f9b47464b9304f2e33cb3cc936b0788797ff7
 DIST aqbanking-5.0.23.tar.gz 3635384 RMD160 8d1f33d157af9648467fbb804756c1b75cf6af48 SHA1 57624aa6670d30cfcccb28903f97370237809a00 SHA256 04f2a9420513040b0e88c93b746d2e193985af909b58cc4ba99db56570059213
+DIST aqbanking-5.0.24.0-git.tar.gz 3637992 RMD160 dc3187ac8fd0d0fea5b1a43c9f50d1446c266195 SHA1 00577801882d63ba9ec7a7c900aae25af124586a SHA256 ac930016693d53a8d97b25a217374ae39cddbf54bc1e6e305815202a145fd879
 DIST aqbanking-5.0.4.tar.gz 3539556 RMD160 597983ab285643deca0415497dfa2875360e906a SHA1 865f7d05fcd48a507ba08f3f80442360c8973919 SHA256 5deaa42e1c1b8a3622e90b1527929855998b7e8dc5f6a18a22388d965ba5df1b
diff --git a/net-libs/aqbanking/aqbanking-5.0.24.0.ebuild b/net-libs/aqbanking/aqbanking-5.0.24.0.ebuild
new file mode 100644
index 000000000000..8daef367cbae
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-5.0.24.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-5.0.24.0.ebuild,v 1.1 2012/06/03 17:51:26 hanno Exp $
+
+EAPI=4
+
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
+SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=03&release=94&file=01&dummy=${P}-git.tar.gz -> ${P}-git.tar.gz"
+S="${WORKDIR}/${P}-git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="chipcard debug doc examples gtk ofx"
+
+RDEPEND=">=app-misc/ktoblzcheck-1.37
+	>=dev-libs/gmp-5
+	>=sys-libs/gwenhywfar-4.3.3[gtk?]
+	virtual/libintl
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+	chipcard? ( >=sys-libs/libchipcard-5.0.2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )"
+
+MAKEOPTS="${MAKEOPTS} -j1" # 5.0.x fails with -j9 on quadcore
+
+src_configure() {
+	local backends="aqhbci aqnone aqpaypal"
+	use ofx && backends="${backends} aqofxconnect"
+
+	local mytest
+	use gtk && mytest="--enable-gui-tests"
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc full-doc) \
+		--with-backends="${backends}" \
+		--with-docpath=/usr/share/doc/${PF}/apidoc \
+		${mytest}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${ED}"usr/share/doc/aq{banking,hbci,paypal}
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
+		README.aqhbci-tool
+	newdoc src/plugins/backends/aqpaypal/tools/aqpaypal-tool/README \
+		README.aqpaypal-tool
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h} tutorials/README
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/libnet/libnet-1.0.2a-r4.ebuild b/net-libs/libnet/libnet-1.0.2a-r4.ebuild
index 240684088d37..c3edfb394855 100644
--- a/net-libs/libnet/libnet-1.0.2a-r4.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r4.ebuild,v 1.4 2012/05/31 15:06:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r4.ebuild,v 1.5 2012/06/03 18:22:16 maekke Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/Libnet-${PV}
diff --git a/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild
index 65cb61feb5c6..32c03f30bb1d 100644
--- a/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild,v 1.1 2012/03/08 04:20:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.8.2-r2.ebuild,v 1.2 2012/06/03 18:28:57 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="no24bpp crypt gnutls ipv6 +jpeg test threads +zlib"
 
 DEPEND="crypt? ( dev-libs/libgcrypt )
diff --git a/net-libs/openslp/openslp-1.2.1-r2.ebuild b/net-libs/openslp/openslp-1.2.1-r2.ebuild
index c845c9c7aa31..6eb11b9bf545 100644
--- a/net-libs/openslp/openslp-1.2.1-r2.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r2.ebuild,v 1.3 2012/05/12 01:41:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r2.ebuild,v 1.4 2012/06/03 21:36:21 ago Exp $
 
 inherit eutils autotools
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index e2607e79370d..2a33569f6b27 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -3,3 +3,4 @@ DIST bfgminer-2.3.5.tbz2 4651226 RMD160 f75d1d069bf88b8b5d6cb7fce97bf24cac1f88ca
 DIST bfgminer-2.3.6.tbz2 4651689 RMD160 7b3f8d56f7b9bc1fa19825a4c77abcbe307a74c3 SHA1 beecf2d2afc124f4bdb55619002305d48aa5177e SHA256 e55b50cc2e1e77de09a5debfdffabe05fa82307c8b93fabf914823f27e24cf78
 DIST bfgminer-2.4.0.tbz2 4652292 RMD160 059c2ec44a493d0dedf30748c0d06aaac8ee5f20 SHA1 cebb22e38833a8cbbd5b9362e329120337e2c927 SHA256 671451c3df528dd7656fbe2653b71c1b088391799bd3a5f52a193ad4debd025a
 DIST bfgminer-2.4.1.tbz2 4654229 RMD160 54cc68cd3ada8c6c9a793aa5616527402f526026 SHA1 6650301e7bb6e77174f8022646172eb3eaabff1d SHA256 7434c99033362651d56abb0315aeabb2c6a5544fa4241d82b2c64db4b9254cd4
+DIST bfgminer-2.4.2.tbz2 4809197 RMD160 c66a4b80e7afd310495945774960c78d907ca0b8 SHA1 69681b0abfade644b4f1822ad744c129a4a88641 SHA256 9af812771cac266882a83f1f6591d1005e9c0f46fe86af6b4ed0df469531d6e6
diff --git a/net-misc/bfgminer/bfgminer-2.4.2.ebuild b/net-misc/bfgminer/bfgminer-2.4.2.ebuild
new file mode 100644
index 000000000000..2d2e6fd6361a
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-2.4.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.4.2.ebuild,v 1.1 2012/06/03 15:32:32 blueness Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin CPU/GPU/FPGA miner in C"
+HOMEPAGE="https://bitcointalk.org/index.php?topic=78192.0"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE="
+	|| ( bitforce cpumining icarus opencl ztex )
+	adl? ( opencl )
+	altivec? ( cpumining ppc ppc64 )
+	padlock? ( cpumining || ( amd64 x86 ) )
+	sse2? ( cpumining || ( amd64 x86 ) )
+	sse4? ( cpumining amd64 )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses
+	)
+	dev-libs/jansson
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		virtual/libusb:1
+	)
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	sys-apps/sed
+	adl? (
+		x11-libs/amd-adl-sdk
+	)
+	opencl? (
+		virtual/opencl
+	)
+	sse2? (
+		>=dev-lang/yasm-1.0.1
+	)
+	sse4? (
+		>=dev-lang/yasm-1.0.1
+	)
+"
+
+src_prepare() {
+	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
+	ln -s /usr/include/ADL/* ADL_SDK/
+}
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	if ! use altivec; then
+		sed -i 's/-faltivec//g' configure
+	else
+		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
+	fi
+	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
+	if use sse2; then
+		if use amd64; then
+			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
+		else
+			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
+		fi
+	fi
+	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
+	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable bitforce) \
+		$(use_enable cpumining) \
+		$(use_enable icarus) \
+		$(use_with ncurses curses) \
+		$(use_enable opencl) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
+	if use opencl; then
+		# sanitize directories
+		sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/bfgminer/opencl"'"~' config.h
+	fi
+	if use ztex; then
+		sed -i 's~bitstreams/~'"${EPREFIX}"'/usr/lib/bfgminer/ztex/~' libztex.c
+	fi
+}
+
+src_install() {
+	dobin bfgminer
+	dodoc AUTHORS NEWS README API-README
+	if use icarus; then
+		dodoc FPGA-README
+	fi
+	if use opencl; then
+		insinto /usr/lib/bfgminer/opencl
+		doins *.cl
+	fi
+	if use ztex; then
+		insinto /usr/lib/bfgminer/ztex
+		doins bitstreams/*.bit
+	fi
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c
+	fi
+}
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 458ae4168f53..e654fdd74cb6 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -3,3 +3,4 @@ DIST cgminer-2.3.5.tar.bz2 4470889 RMD160 49f349ca8e506534426ed0d957b8709f3b50d2
 DIST cgminer-2.3.6.tar.bz2 4471825 RMD160 9496c804574d25fd3c79c313d12bd3cbfba44c1e SHA1 4b08cbc2cf5b4e3d1c89dc651e7b8aa8cb76e1d5 SHA256 792c8a2be9f6e8e6e182a6d6459a6becd5263a05e5dedc315b5665a2e0fa105c
 DIST cgminer-2.4.0.tar.bz2 4473741 RMD160 92789ad524bcd432b6e1957251f8ae93be3f78f3 SHA1 5a8acef5be358a794b42aeb139ea7a37c5ab74e5 SHA256 30a0c018094c93b1f915b67f5cad8cd935838e1ffac862aa6d05ee37f3fbb387
 DIST cgminer-2.4.1.tar.bz2 4476025 RMD160 a636e7d0a573c6d6ca4ad667f69f6df339ce81ee SHA1 80fd856484ce311916c071c647bac337395ad2b9 SHA256 41a9aebc13d55358b96bc7cb2b428edf81f61be79918022d2979dee68c71413a
+DIST cgminer-2.4.2.tar.bz2 4477734 RMD160 8af9961c2baa9dbdabbf1bd90b2054fc3a5c24ef SHA1 e2ca8878452132decaed1daf6d76f99034b8d172 SHA256 f307e314da830a165f2a7bdc3ef3470d2bcf76d159788a100d99f0a0ce72146f
diff --git a/net-misc/cgminer/cgminer-2.4.2.ebuild b/net-misc/cgminer/cgminer-2.4.2.ebuild
new file mode 100644
index 000000000000..f1b7179242ea
--- /dev/null
+++ b/net-misc/cgminer/cgminer-2.4.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.4.2.ebuild,v 1.2 2012/06/03 15:27:05 blueness Exp $
+
+EAPI="4"
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
+HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE="
+	|| ( bitforce cpumining icarus opencl ztex )
+	adl? ( opencl )
+	altivec? ( cpumining ppc ppc64 )
+	padlock? ( cpumining || ( amd64 x86 ) )
+	sse2? ( cpumining || ( amd64 x86 ) )
+	sse4? ( cpumining amd64 )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses
+	)
+	dev-libs/jansson
+	opencl? (
+		virtual/opencl
+	)
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		virtual/libusb:1
+	)
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	sys-apps/sed
+	adl? (
+		x11-libs/amd-adl-sdk
+	)
+	sse2? (
+		>=dev-lang/yasm-1.0.1
+	)
+	sse4? (
+		>=dev-lang/yasm-1.0.1
+	)
+"
+
+src_prepare() {
+	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
+	ln -s /usr/include/ADL/* ADL_SDK/
+}
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	if ! use altivec; then
+		sed -i 's/-faltivec//g' configure
+	else
+		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
+	fi
+	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
+	if use sse2; then
+		if use amd64; then
+			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
+		else
+			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
+		fi
+	fi
+	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
+	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable bitforce) \
+		$(use_enable cpumining) \
+		$(use_enable icarus) \
+		$(use_with ncurses curses) \
+		$(use_enable opencl) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
+	if use opencl; then
+		# sanitize directories
+		sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer/opencl"'"~' config.h
+	fi
+	if use ztex; then
+		sed -i 's~bitstreams/~'"${EPREFIX}"'/usr/lib/cgminer/ztex/~' libztex.c
+	fi
+}
+
+src_install() {
+	dobin cgminer
+	dodoc AUTHORS NEWS README
+	if use opencl; then
+		insinto /usr/lib/cgminer/opencl
+		doins *.cl
+	fi
+	if use ztex; then
+		insinto /usr/lib/cgminer/ztex
+		doins bitstreams/*.bit
+	fi
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c
+	fi
+}
diff --git a/net-misc/efax/efax-0.9a-r3.ebuild b/net-misc/efax/efax-0.9a-r3.ebuild
index c49add561a2b..fd1b86cd73b8 100644
--- a/net-misc/efax/efax-0.9a-r3.ebuild
+++ b/net-misc/efax/efax-0.9a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a-r3.ebuild,v 1.2 2012/03/03 21:28:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a-r3.ebuild,v 1.3 2012/06/03 18:29:23 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://gentoo.org"
 SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz
 	mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index de99aee2485f..b42dc1f9f247 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,2 +1 @@
-DIST miniupnpd-1.6.20120509.tar.gz 137147 RMD160 42d2513646ae0395e04d20211d849255c56e2873 SHA1 9f5a5f844d443a7c9f6281cdeacbc9f0d79c826b SHA256 148964bc508abcf1736a6e6b4e525bc56c0d35a588661636420fdd283347b36a
-DIST miniupnpd-1.6.tar.gz 124917 RMD160 11ef50d02983d19e7d6eaa07eea5eb77f76cce04 SHA1 d8469ba820487fcbf5260556ec2974dd9db69f40 SHA256 a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
+DIST miniupnpd-1.7.tar.gz 138047 RMD160 fbf6cf43e177d3ef82c00b44653f0570ca0a723e SHA1 79e9e5e45b5492e0dd350e54e32f0fdbaf381fa8 SHA256 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74
diff --git a/net-misc/miniupnpd/miniupnpd-1.6.ebuild b/net-misc/miniupnpd/miniupnpd-1.6.ebuild
deleted file mode 100644
index 27eff0178dd8..000000000000
--- a/net-misc/miniupnpd/miniupnpd-1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.6.ebuild,v 1.1 2011/07/29 19:36:58 gurligebis Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PV=1.6
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-firewall/iptables-1.4.6
-	sys-apps/lsb-release
-	>=sys-kernel/linux-headers-2.6.31"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	"
-
-src_prepare() {
-	mv Makefile.linux Makefile
-	epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
-	epatch "${FILESDIR}/${PN}-nf_nat-fix.diff"
-	sed -i \
-		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
-		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
-		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
-		-e 's/genuuid||//' \
-		Makefile || die
-	sed -i \
-		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
-		netfilter/iptcrdr.c || die
-	emake config.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	einstall PREFIX="${D}" STRIP="true" || die "einstall failed"
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-1.7_pre20120509.ebuild b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
similarity index 94%
rename from net-misc/miniupnpd/miniupnpd-1.7_pre20120509.ebuild
rename to net-misc/miniupnpd/miniupnpd-1.7.ebuild
index a52b0aadded0..3e7f8cf47988 100644
--- a/net-misc/miniupnpd/miniupnpd-1.7_pre20120509.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.7_pre20120509.ebuild,v 1.1 2012/05/13 17:48:41 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.7.ebuild,v 1.1 2012/06/03 16:26:12 gurligebis Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
 
-MY_PV=1.6.20120509
+MY_PV=1.7
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="MiniUPnP IGD Daemon"
diff --git a/net-misc/radvd/radvd-1.8.5-r1.ebuild b/net-misc/radvd/radvd-1.8.5-r1.ebuild
index dd296c4d475d..571ec5aef0da 100644
--- a/net-misc/radvd/radvd-1.8.5-r1.ebuild
+++ b/net-misc/radvd/radvd-1.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-1.8.5-r1.ebuild,v 1.4 2012/05/30 08:38:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-1.8.5-r1.ebuild,v 1.5 2012/06/03 18:17:05 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~hppa ppc ~sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux"
 
 DEPEND="sys-devel/bison
diff --git a/net-misc/sobby/sobby-0.4.8.ebuild b/net-misc/sobby/sobby-0.4.8.ebuild
index 2453a4dcaba0..61ac04d6b890 100644
--- a/net-misc/sobby/sobby-0.4.8.ebuild
+++ b/net-misc/sobby/sobby-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/sobby-0.4.8.ebuild,v 1.2 2012/05/05 03:20:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/sobby-0.4.8.ebuild,v 1.3 2012/06/03 21:35:51 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gobby.0x539.de/"
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="avahi"
 
 RDEPEND=">=dev-cpp/glibmm-2.6
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 5303d355020e..b620f4902ed1 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -5,4 +5,6 @@ DIST tigervnc-1.1.0_xorg-1.12.patch.bz2 2290 RMD160 4d4953da529580349e209b5e8e64
 DIST tigervnc.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
 DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
 DIST xorg-server-1.11.2.tar.bz2 4945939 RMD160 cc69cfd86a5a870d1433262dd1445a8603a9266a SHA1 b4de5c599c90bd08d3122866ba68152cd59a880e SHA256 fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
+DIST xorg-server-1.11.4.tar.bz2 4900810 RMD160 26eafdda9e7c9e21e606281dacc13e67d0144eef SHA1 adb5b0bf95a943385c08f826a647871aa1d8d6eb SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc
 DIST xorg-server-1.12.1.tar.bz2 5349351 RMD160 f52d2ba58999bc8bfbe5f37a29256046014fdbd2 SHA1 922b963901f4711449b53fb32ce3e14f5b642766 SHA256 d21dc1dac767975cf9872984c78dd0bff928a74420fbcb415267c6bdbd41b45a
+DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7dd805f66 SHA1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild
new file mode 100644
index 000000000000..6a514a05c8a8
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild,v 1.2 2012/06/04 08:44:49 ago Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.11.4"
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2
+#	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
+	mirror://gentoo/${PN}.png
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
+		mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nptl +opengl server +xorgmodule"
+
+RDEPEND="virtual/jpeg
+	sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	app-admin/eselect-opengl
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-alias
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+	)
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-1.5
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		>=x11-proto/randrproto-1.2.99
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xcmiscproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86driproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		opengl? ( >=x11-proto/glproto-1.4.10 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+		>=x11-libs/xtrans-1.2.2
+	)"
+
+#S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if ! use server ; then
+		echo
+		einfo "The 'server' USE flag will build tigervnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	else
+		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+		OLD_IMPLEM="$(eselect opengl show)"
+		eselect opengl set ${OPENGL_DIR}
+	fi
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set ${OLD_IMPLEM}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	fi
+
+	eautoreconf
+	cd unix
+
+	if use server ; then
+		epatch xserver110.patch
+		epatch "${WORKDIR}"/${P}_xorg-1.11.patch
+		cd xserver
+		epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
+		epatch "${FILESDIR}"/1.1.0-gethomedir.patch
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd unix/xserver
+		econf \
+			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+			--disable-static --disable-xinerama \
+			--disable-composite \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			--enable-install-libxf86config \
+			--enable-dri2 \
+			--disable-config-dbus \
+			--disable-config-hal \
+			--with-xmlto=no \
+			--disable-unit-tests \
+			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	dodoc README.txt
+
+	cd unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd xserver/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+	else
+		cd "${D}"
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f
+			rm usr/share/man/man1/$f.1
+		done
+	fi
+}
+
+pkg_postinst() {
+	use server && switch_opengl_implem
+}
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
new file mode 100644
index 000000000000..1fa79327b59a
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild,v 1.1 2012/06/03 18:37:41 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.12.2"
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2
+#	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
+	mirror://gentoo/${PN}.png
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
+		mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2
+		mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nptl +opengl server +xorgmodule"
+
+RDEPEND="virtual/jpeg
+	sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	app-admin/eselect-opengl
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-alias
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+	)
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-1.5
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		>=x11-proto/randrproto-1.2.99
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xcmiscproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86driproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		opengl? ( >=x11-proto/glproto-1.4.10 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+		>=x11-libs/xtrans-1.2.2
+	)"
+
+#S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if ! use server ; then
+		echo
+		einfo "The 'server' USE flag will build tigervnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	else
+		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+		OLD_IMPLEM="$(eselect opengl show)"
+		eselect opengl set ${OPENGL_DIR}
+	fi
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set ${OLD_IMPLEM}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	fi
+
+	eautoreconf
+	cd unix
+
+	if use server ; then
+		epatch xserver110.patch
+		epatch "${WORKDIR}"/${P}_xorg-1.11.patch
+		epatch "${WORKDIR}"/${P}_xorg-1.12.patch
+		cd xserver
+		epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
+		epatch "${FILESDIR}"/1.1.0-gethomedir.patch
+		epatch "${FILESDIR}"/1.1.0-xorg-1.12_fix.patch
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd unix/xserver
+		econf \
+			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+			--disable-static --disable-xinerama \
+			--disable-composite \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			--enable-install-libxf86config \
+			--enable-dri2 \
+			--disable-config-dbus \
+			--disable-config-hal \
+			--with-xmlto=no \
+			--disable-unit-tests \
+			--disable-devel-docs \
+			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	dodoc README.txt
+
+	cd unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd xserver/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+	else
+		cd "${D}"
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f
+			rm usr/share/man/man1/$f.1
+		done
+	fi
+}
+
+pkg_postinst() {
+	use server && switch_opengl_implem
+}
diff --git a/net-misc/vtun/vtun-3.0.2-r1.ebuild b/net-misc/vtun/vtun-3.0.2-r1.ebuild
index b9c059f87724..544a23224ded 100644
--- a/net-misc/vtun/vtun-3.0.2-r1.ebuild
+++ b/net-misc/vtun/vtun-3.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.2 2012/03/03 19:29:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.3 2012/06/03 18:32:11 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://vtun.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 3e525dbec49b..bc4d2a6c9596 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,2 +1 @@
-DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
 DIST aMule-2.3.1.tar.bz2 4565232 RMD160 7bc5ceea196f9ba0aa0687a694cc82354a0210fc SHA1 25bcef92b06cb34849afaf052e2cd66b4a8454c2 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
diff --git a/net-p2p/amule/amule-2.2.6.ebuild b/net-p2p/amule/amule-2.2.6.ebuild
deleted file mode 100644
index 3104033f47ce..000000000000
--- a/net-p2p/amule/amule-2.2.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.14 2012/02/16 17:17:32 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic wxwidgets
-
-MY_P=${PN/m/M}-${PV}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
-
-DEPEND="=x11-libs/wxGTK-2.8*
-	>=dev-libs/crypto++-5
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.26[jpeg] )
-	geoip? ( dev-libs/geoip )
-	upnp? ( >=net-libs/libupnp-1.6.6 )
-	remote? ( >=media-libs/libpng-1.2.0
-	unicode? ( >=media-libs/gd-2.0.26 ) )"
-
-pkg_setup() {
-	if ! use gtk && ! use remote && ! use daemon; then
-		eerror ""
-		eerror "You have to specify at least one of gtk, remote or daemon"
-		eerror "USE flag to build amule."
-		eerror ""
-		die "Invalid USE flag set"
-	fi
-
-	if use stats && ! use gtk; then
-		einfo "Note: You would need both the gtk and stats USE flags"
-		einfo "to compile aMule Statistics GUI."
-		einfo "I will now compile console versions only."
-	fi
-}
-
-pkg_preinst() {
-	if use daemon || use remote; then
-		enewgroup p2p
-		enewuser p2p -1 -1 /home/p2p p2p
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fallocate.diff
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	local myconf
-
-	WX_GTK_VER="2.8"
-
-	if use gtk; then
-		einfo "wxGTK with gtk support will be used"
-		need-wxwidgets unicode
-	else
-		einfo "wxGTK without X support will be used"
-		need-wxwidgets base
-	fi
-
-	if use gtk ; then
-		use stats && myconf="${myconf}
-			--enable-wxcas
-			--enable-alc"
-		use remote && myconf="${myconf}
-			--enable-amule-gui"
-	else
-		myconf="
-			--disable-monolithic
-			--disable-amule-gui
-			--disable-wxcas
-			--disable-alc"
-	fi
-
-	econf \
-		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG} \
-		--enable-amulecmd \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		$(use_enable daemon amule-daemon) \
-		$(use_enable geoip) \
-		$(use_enable nls) \
-		$(use_enable remote webserver) \
-		$(use_enable stats cas) \
-		$(use_enable stats alcc) \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use daemon; then
-		newconfd "${FILESDIR}"/amuled.confd amuled
-		newinitd "${FILESDIR}"/amuled.initd amuled
-	fi
-	if use remote; then
-		newconfd "${FILESDIR}"/amuleweb.confd amuleweb
-		newinitd "${FILESDIR}"/amuleweb.initd amuleweb
-	fi
-}
diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
index f2a6daa2e2d2..b37a0289cbe9 100644
--- a/net-p2p/amule/amule-2.3.1.ebuild
+++ b/net-p2p/amule/amule-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.8 2012/05/21 12:25:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.9 2012/06/03 16:57:23 armin76 Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="daemon debug geoip nls remote stats unicode upnp +X"
 
 DEPEND=">=dev-libs/crypto++-5
diff --git a/net-p2p/amule/files/amule-2.2.6-gcc45.patch b/net-p2p/amule/files/amule-2.2.6-gcc45.patch
deleted file mode 100644
index e120ef23b76f..000000000000
--- a/net-p2p/amule/files/amule-2.2.6-gcc45.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Subject: Fix FTBFS on gcc 4.5 (new in ubuntu natty)
-# Origin: other, http://bugs.amule.org/view.php?id=1624
-# Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/amule/+bug/685584
-# Forwarded: upstream claims it's in their current svn code
-Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp
-===================================================================
---- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:46:18.435693002 +0000
-+++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:47:07.151693001 +0000
-@@ -285,11 +285,11 @@
- #ifdef __WXMSW__
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
- #else
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
- #endif
- 
- 	memdc.
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
index a98cba5e1dd0..286b52700958 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild,v 1.3 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild,v 1.4 2012/06/04 06:51:36 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 # libgnome-bluetooth-applet.la is needed by gnome-shell during compilation
 GNOME2_LA_PUNT="no"
 
-inherit gnome2 multilib
+inherit eutils gnome2 multilib
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild
index b42906546e47..3416673f6571 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild,v 1.1 2012/05/13 23:38:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild,v 1.2 2012/06/04 06:51:36 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib
+inherit eutils gnome2 multilib
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index b85dfcac0646..8ff5c228e54c 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,8 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.123 2012/05/31 01:15:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.124 2012/06/04 06:01:24 xmw Exp $
 
 
+# Michael Weber <xmw@gentoo.org> (3 Jun 2012)
+# pymol got stabled (bug 366229) but USE=apbs deps aren't keyworded
+sci-chemistry/pymol apbs
+
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 May 2012)
 # Mask new useflag of opencv, as dependency dev-cpp/tbb is not keyworded on ppc
 media-libs/opencv tbb
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index abf5b416a748..d7935fe67b56 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/package.use.mask,v 1.27 2012/04/17 15:46:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/package.use.mask,v 1.29 2012/06/04 06:01:24 xmw Exp $
 
 # This file requires >=portage-2.1.1
 
-
 # ranger <ranger@gentoo.org> (17 apr 2012)
 # masking libvirt for cfengine (bug #412253)
 net-misc/cfengine libvirt
diff --git a/profiles/package.mask b/profiles/package.mask
index bd7423caa2d7..10611cfb12a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13816 2012/06/02 20:48:56 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13820 2012/06/04 02:59:46 ottxor 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
@@ -31,6 +31,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Christoph Junghans <ottxor@gentoo.org> (04 Jun 2012)
+# Mask for testing and porting. Tracker Bug #418473
+app-admin/eselect-awk
+
+# Markos Chandras <hwoarang@gentoo.org> (04 Jun 2012)
+# Dead upstream. Security problems. Bug #249112
+# Removal in 30 days
+net-misc/ptrtd
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (03 Jun 2012)
+# Not maintained well in Gentoo for a long time. Better support 
+# for zeroconf is available via net-dns/avahi[mdnsresponder-compat]
+# - please use that instead. mDNSResponder will be removed soon.
+net-misc/mDNSResponder
+
 # Torsten Veller <tove@gentoo.org> (02 Jun 2012)
 # Install perl modules in the site branch (#280728)
 # - dev-perl/Cflow (#391391)
@@ -356,11 +371,6 @@ app-dicts/canna-canda-med
 app-dicts/canna-shion
 app-dicts/canna-zipcode
 
-# Markos Chandras <hwoarang@gentoo.org> (06 May 2012)
-# Stopped working long time ago. Removal in 30 days
-# Use emesene:2 as an alternative
-net-im/emesene:0
-
 # Johannes Huber <johu@gentoo.org> (03 May 2012)
 # Unstable dev channel release. Fixes build with gcc47
 # (bug #413941).
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
index 727d9e2eda34..c542af3afc13 100644
--- a/profiles/updates/2Q-2012
+++ b/profiles/updates/2Q-2012
@@ -17,3 +17,4 @@ move dev-texlive/texlive-latex3 dev-texlive/texlive-latexrecommended
 move net-libs/axTLS net-libs/axtls
 move x11-misc/tudor-volumed media-sound/tudor-volumed
 move media-video/leechcraft-lmp media-sound/leechcraft-lmp
+move x11-themes/gtk-engines-nimbus x11-themes/nimbus
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index cf4b179a859a..b04dbc9c7d8a 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.12 2012/05/04 06:46:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.13 2012/06/03 15:37:31 jlec Exp $
 
 EAPI=2
 
@@ -60,6 +60,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng15.patch \
 		"${FILESDIR}"/${P}-linking.patch
 
+	# gcc-47, #414015
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+
 	# remove flags to let the user decide
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch
new file mode 100644
index 000000000000..385f39a20511
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch
@@ -0,0 +1,22 @@
+diff -up celestia-1.6.1/src/celengine/frametree.h.gcc47 celestia-1.6.1/src/celengine/frametree.h
+--- celestia-1.6.1/src/celengine/frametree.h.gcc47	2012-03-22 12:56:56.096087430 -0400
++++ celestia-1.6.1/src/celengine/frametree.h	2012-03-22 12:57:04.333022427 -0400
+@@ -13,6 +13,7 @@
+ #ifndef _CELENGINE_FRAMETREE_H_
+ #define _CELENGINE_FRAMETREE_H_
+ 
++#include <unistd.h>
+ #include <vector>
+ 
+ class Star;
+diff -up celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 celestia-1.6.1/src/celengine/planetgrid.cpp
+--- celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47	2012-03-22 12:53:01.496950513 -0400
++++ celestia-1.6.1/src/celengine/planetgrid.cpp	2012-03-22 12:53:08.812891865 -0400
+@@ -12,6 +12,7 @@
+ 
+ #include <cstdio>
+ #include <cmath>
++#include <celmath/mathlib.h>
+ #include <celmath/intersect.h>
+ #include "planetgrid.h"
+ #include "body.h"
diff --git a/sci-biology/clustalw/clustalw-2.1.ebuild b/sci-biology/clustalw/clustalw-2.1.ebuild
index 770df9d3036e..6d41156ddc6b 100644
--- a/sci-biology/clustalw/clustalw-2.1.ebuild
+++ b/sci-biology/clustalw/clustalw-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw/clustalw-2.1.ebuild,v 1.1 2012/04/22 15:49:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw/clustalw-2.1.ebuild,v 1.2 2012/06/04 08:43:43 ago Exp $
 
 EAPI=4
 
@@ -10,5 +10,5 @@ SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
diff --git a/sci-biology/clustalx/clustalx-2.1.ebuild b/sci-biology/clustalx/clustalx-2.1.ebuild
index c4ef02e7399e..a0b40d7987e0 100644
--- a/sci-biology/clustalx/clustalx-2.1.ebuild
+++ b/sci-biology/clustalx/clustalx-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/clustalx-2.1.ebuild,v 1.1 2012/04/22 15:53:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/clustalx-2.1.ebuild,v 1.2 2012/06/04 08:43:25 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/qt-core:4
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild
index 7e21781be492..91c181a2574a 100644
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild
+++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild,v 1.2 2011/12/24 09:01:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild,v 1.3 2012/06/04 08:49:15 jlec Exp $
 
 EAPI=3
 
@@ -32,6 +32,8 @@ RESTRICT="fetch"
 
 S="${WORKDIR}/${MY_P}"
 
+QA_PREBUILT="opt/arp-warp-bin/bin/.*"
+
 pkg_nofetch(){
 	elog "Fill out the form at http://www.embl-hamburg.de/ARP/"
 	elog "and place ${A} in ${DISTDIR}"
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild
deleted file mode 100644
index 59ca799dff3f..000000000000
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1.ebuild,v 1.15 2012/04/14 09:38:47 nativemad Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils prefix python
-
-MY_P="arp_warp_${PV}"
-
-DESCRIPTION="Software for improvement and interpretation of crystallographic electron density maps"
-SRC_URI="${MY_P}.tar.gz"
-HOMEPAGE="http://www.embl-hamburg.de/ARP/"
-
-LICENSE="ArpWarp"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-shells/tcsh
-	sci-chemistry/refmac
-	sys-apps/gawk
-	virtual/jre
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND=""
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_nofetch(){
-	elog "Fill out the form at http://www.embl-hamburg.de/ARP/"
-	elog "and place ${A} in ${DISTDIR}"
-}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-setup.patch
-	eprefixify "${S}"/share/arpwarp_setup_base.*
-	sed "s:PYVER:$(python_get_version):g" -i "${S}"/share/arpwarp_setup_base.*
-	python_convert_shebangs $(python_get_version) flex-wARP-src-354/*py
-	sed -e "s:/usr/:${EPREFIX}/usr/:g" -i flex-wARP-src-354/*py || die
-}
-
-src_install(){
-	PYVER=$(python_get_version)
-	m_type=$(uname -m)
-	os_type=$(uname)
-
-	insinto /opt/${PN}/byte-code/python-${PYVER}
-	doins "${S}"/flex-wARP-src-354/*py || die
-
-	exeinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doexe "${S}"/bin/bin-${m_type}-${os_type}/* && \
-	doexe "${S}"/share/*sh || die
-
-	insinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh} || die
-
-	insinto /etc/profile.d/
-	newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh && \
-	newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh || die
-
-	dodoc "${S}"/README manual/UserGuide${PV}.pdf || die
-	dohtml -r "${S}"/manual/html/* || die
-}
-
-pkg_postinst(){
-	python_need_rebuild
-	python_mod_optimize /opt/${PN}/byte-code/python-${PYVER}
-
-	testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}')
-	if [ $testcommand == "1,5" ];then
-	  ewarn "*** ERROR ***"
-	  ewarn "   3/2=" $testcommand
-	  ewarn "Invalid decimal separator (must be ".")"
-	  ewarn "You need to set this correctly!!!"
-	  echo
-	  ewarn "One way of setting the decimal separator is:"
-	  ewarn "setenv LC_NUMERIC C' in your .cshrc file"
-	  ewarn "\tor"
-	  ewarn "export LC_NUMERIC=C' in your .bashrc file"
-	  ewarn "Otherwise please consult your system manager"
-	fi
-
-	grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg."
-	echo
-}
-
-pkg_postrm() {
-	python_mod_cleanup /opt/${PN}/byte-code/python-${PYVER}
-}
diff --git a/sci-chemistry/dssp/Manifest b/sci-chemistry/dssp/Manifest
index f163dcb06344..416877a43dc3 100644
--- a/sci-chemistry/dssp/Manifest
+++ b/sci-chemistry/dssp/Manifest
@@ -1,2 +1,3 @@
 DIST dssp-070831cmbi.tar.gz 451919 RMD160 656e1be2c5db6150a3db2785bcaf874632b3cf27 SHA1 40ffc8fcd1400eb4675285995f1c366ff6612004 SHA256 bf5cdd970f92fd80268b87a468d4efe891d3227fd15136147889605299f75661
 DIST dssp-101007.tar.gz 541779 RMD160 aac7fb41de73b011fcbe3358c35e27e0272257af SHA1 1809b8128b4aafe77de8f2e8d68cf1ab835d4051 SHA256 2678aa0914df970c79862bf04f854eff97a23d2b6710a1b82ddcf8dec41ef37c
+DIST dssp-2.0.4.tgz 33515 RMD160 4aef95c7921c1fc7e17b831e1ad08c6eaf8033d0 SHA1 af7e15f16a732bed4f6631557d6c84bffbb934bc SHA256 9444f36a26c003c5578aa863c3725ff23b0511abe7d7fc873dbd8294dcb2b66b
diff --git a/sci-chemistry/dssp/dssp-2.0.4.ebuild b/sci-chemistry/dssp/dssp-2.0.4.ebuild
new file mode 100644
index 000000000000..7b8f77bda909
--- /dev/null
+++ b/sci-chemistry/dssp/dssp-2.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/dssp/dssp-2.0.4.ebuild,v 1.1 2012/06/03 15:06:13 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="The protein secondary structure standard"
+HOMEPAGE="http://swift.cmbi.ru.nl/gv/dssp/"
+SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/dssp-2.0.4.tgz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	tc-export CXX
+
+	cat >> make.config <<- EOF
+	BOOST_LIB_SUFFIX = -mt
+	BOOST_LIB_DIR = "${EPREFIX}/usr/$(get_libdir)"
+	BOOST_INC_DIR = "${EPREFIX}/usr/include"
+	EOF
+
+	epatch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	dobin mkdssp
+	dosym mkdssp /usr/bin/dssp
+	doman doc/mkdssp.1
+	dodoc README.txt changelog
+}
diff --git a/sci-chemistry/dssp/files/dssp-2.0.4-gcc47.patch b/sci-chemistry/dssp/files/dssp-2.0.4-gcc47.patch
new file mode 100644
index 000000000000..5db1437beb1f
--- /dev/null
+++ b/sci-chemistry/dssp/files/dssp-2.0.4-gcc47.patch
@@ -0,0 +1,46 @@
+ src/matrix.h          |    5 +++--
+ src/primitives-3d.cpp |    1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/matrix.h b/src/matrix.h
+index 1053ad9..d7dae5f 100644
+--- a/src/matrix.h
++++ b/src/matrix.h
+@@ -14,6 +14,7 @@
+ #include <istream>
+ #include <cassert>
+ #include <stdexcept>
++#include <unistd.h>
+ 
+ // --------------------------------------------------------------------
+ // uBlas compatible matrix types
+@@ -284,7 +285,7 @@ class identity_matrix : public matrix_base<T>
+ template<typename T>
+ matrix<T> operator*(const matrix_base<T>& lhs, const matrix_base<T>& rhs)
+ {
+-	matrix<T> result(min(lhs.dim_m(), rhs.dim_m()), min(lhs.dim_n(), rhs.dim_n()));
++	matrix<T> result(std::min(lhs.dim_m(), rhs.dim_m()), std::min(lhs.dim_n(), rhs.dim_n()));
+ 	
+ 	for (uint32 i = 0; i < result.dim_m(); ++i)
+ 	{
+@@ -310,7 +311,7 @@ matrix<T> operator*(const matrix_base<T>& lhs, T rhs)
+ template<typename T>
+ matrix<T> operator-(const matrix_base<T>& lhs, const matrix_base<T>& rhs)
+ {
+-	matrix<T> result(min(lhs.dim_m(), rhs.dim_m()), min(lhs.dim_n(), rhs.dim_n()));
++	matrix<T> result(std::min(lhs.dim_m(), rhs.dim_m()), std::min(lhs.dim_n(), rhs.dim_n()));
+ 	
+ 	for (uint32 i = 0; i < result.dim_m(); ++i)
+ 	{
+diff --git a/src/primitives-3d.cpp b/src/primitives-3d.cpp
+index b04e7c4..4532ecd 100644
+--- a/src/primitives-3d.cpp
++++ b/src/primitives-3d.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include <valarray>
+ #include <cmath>
++#include <unistd.h>
+ 
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
diff --git a/sci-chemistry/dssp/files/dssp-2.0.4-gentoo.patch b/sci-chemistry/dssp/files/dssp-2.0.4-gentoo.patch
new file mode 100644
index 000000000000..3db40f640ccd
--- /dev/null
+++ b/sci-chemistry/dssp/files/dssp-2.0.4-gentoo.patch
@@ -0,0 +1,70 @@
+ makefile |   24 ++++++++++++++----------
+ 1 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/makefile b/makefile
+index df699b7..9d2167b 100644
+--- a/makefile
++++ b/makefile
+@@ -2,7 +2,7 @@
+ #
+ #  Copyright Maarten L. Hekkelman, Radboud University 2008-2011.
+ # Distributed under the Boost Software License, Version 1.0.
+-#    (See accompanying file LICENSE_1_0.txt or copy at
++#    (See aCXXompanying file LICENSE_1_0.txt or copy at
+ #          http://www.boost.org/LICENSE_1_0.txt)
+ #
+ # This makefile includes a file called make.config. It will create a
+@@ -24,22 +24,23 @@ BOOST_LIBS			= thread regex filesystem program_options date_time iostreams math_
+ LIBS				= $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) z bz2
+ 
+ DEFINES				= USE_COMPRESSION LINUX VERSION='"$(VERSION)"'
+-CC					= c++
++CXX					?= c++
+ 
+-CFLAGS				= $(INC_DIR:%=-I%) -iquote src -g -Wall -Wno-multichar -pthread
+-LDOPTS				= $(LIB_DIR:%=-L%) $(LIBS:%=-l%) -g -pthread
++CPPFLAGS				+= $(INC_DIR:%=-I%) -iquote src
++CXXFLAGS          += -Wall -Wno-multichar -pthread
++LDOPTS				= $(LIB_DIR:%=-L%) $(LIBS:%=-l%) -pthread
+ 
+ OBJ_DIR				= obj
+ 
+ ifeq ($(DEBUG),1)
+ OBJ_DIR				:= $(OBJ_DIR).dbg
+-CFLAGS				+= -g3
++CFLAGS				+= 
+ else
+ DEFINES				+= NDEBUG
+-CFLAGS				+= -O3
++CFLAGS				+= 
+ endif
+ 
+-CFLAGS				+= $(DEFINES:%=-D%)
++CPPFLAGS				+= $(DEFINES:%=-D%)
+ 
+ DIST_NAME			= dssp-$(VERSION)
+ 
+@@ -49,17 +50,20 @@ OBJECTS = $(OBJ_DIR)/mkdssp.o $(OBJ_DIR)/dssp.o $(OBJ_DIR)/primitives-3d.o $(OBJ
+ 
+ mkdssp: $(OBJECTS)
+ 	@ echo linking $@
+-	@ $(CC) -static -o $@ $^ $(LDOPTS)
++	$(CXX) $(LDFLAGS) -o $@ $^ $(LDOPTS)
+ 	@ echo OK
+ 
+ include $(OBJECTS:%.o=%.d)
+ 
+ $(OBJECTS:.o=.d):
+ 
+-$(OBJ_DIR)/%.o: %.cpp
++OBJ_DIR:
+ 	@ if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
++
++
++$(OBJ_DIR)/%.o: %.cpp OBJ_DIR
+ 	@ echo compiling $@
+-	@ $(CC) -MD -c -o $@ $< $(CFLAGS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c -o $@ $<
+ 
+ clean:
+ 	rm -rf $(OBJ_DIR)/* mkdssp
diff --git a/sci-chemistry/dssp/metadata.xml b/sci-chemistry/dssp/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-chemistry/dssp/metadata.xml
+++ b/sci-chemistry/dssp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild b/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild
index 1b132c9dd666..6429b8cbae52 100644
--- a/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild,v 1.5 2012/02/26 06:10:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.3.1_pre3925-r1.ebuild,v 1.6 2012/06/04 06:02:01 xmw Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://gentoo/${PF}.tar.gz"
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="apbs numpy shaders vmd"
 
 DEPEND="
diff --git a/sci-chemistry/scala/scala-3.3.18-r2.ebuild b/sci-chemistry/scala/scala-3.3.18-r2.ebuild
index dfe17701d690..67537c8666b6 100644
--- a/sci-chemistry/scala/scala-3.3.18-r2.ebuild
+++ b/sci-chemistry/scala/scala-3.3.18-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.18-r2.ebuild,v 1.5 2012/06/01 12:34:34 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.18-r2.ebuild,v 1.6 2012/06/03 19:31:46 ago Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
 
 LICENSE="ccp4"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-mathematics/singular/singular-3.1.4-r1.ebuild b/sci-mathematics/singular/singular-3.1.4-r1.ebuild
index b41632d00905..52ae0cd10427 100644
--- a/sci-mathematics/singular/singular-3.1.4-r1.ebuild
+++ b/sci-mathematics/singular/singular-3.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.4-r1.ebuild,v 1.1 2012/05/13 06:42:27 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.4-r1.ebuild,v 1.2 2012/06/03 19:30:58 ago Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
@@ -28,7 +28,7 @@ SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
 IUSE="boost doc emacs examples python +readline test"
 
 RDEPEND="dev-libs/gmp
diff --git a/sys-apps/hotplug/files/isapnp.rc.empty b/sys-apps/hotplug/files/isapnp.rc.empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/sys-apps/hotplug/hotplug-20040923-r1.ebuild b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
index 61b435d55564..001bcf5e3df8 100644
--- a/sys-apps/hotplug/hotplug-20040923-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.5 2010/10/08 01:53:37 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.6 2012/06/04 01:12:43 ssuominen Exp $
 
 inherit eutils
 
@@ -40,7 +40,8 @@ src_install() {
 	exeinto /etc/hotplug
 	doexe *.agent *.rc *.permissions || die
 	# stupid isapnp.rc files...
-	newexe "${FILESDIR}"/isapnp.rc.empty isapnp.rc
+	touch "${T}"/isapnp.rc.empty
+	newexe "${T}"/isapnp.rc.empty isapnp.rc
 
 	dodir /usr/lib/hotplug/firmware
 	dodir /etc/hotplug/usb
diff --git a/sys-apps/hotplug/hotplug-20040923-r2.ebuild b/sys-apps/hotplug/hotplug-20040923-r2.ebuild
index 5ac81c762ab9..d82423607526 100644
--- a/sys-apps/hotplug/hotplug-20040923-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r2.ebuild,v 1.3 2010/10/08 01:53:37 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r2.ebuild,v 1.4 2012/06/04 01:12:43 ssuominen Exp $
 
 inherit eutils
 
@@ -46,7 +46,8 @@ src_install() {
 	exeinto /etc/hotplug
 	doexe *.agent *.rc *.permissions || die
 	# stupid isapnp.rc files...
-	newexe "${FILESDIR}"/isapnp.rc.empty isapnp.rc
+	touch "${T}"/isapnp.rc.empty
+	newexe "${T}"/isapnp.rc.empty isapnp.rc
 
 	dodir /usr/lib/hotplug/firmware
 	dodir /etc/hotplug/usb
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
new file mode 100644
index 000000000000..08f558a5616d
--- /dev/null
+++ b/sys-apps/nawk/Manifest
@@ -0,0 +1 @@
+DIST awk.tar.gz 108035 RMD160 0c8536e9d2212b05f77b9939a6d386dd819aaa66 SHA1 333d93c746aa16e33c5c4aaf505009914cea4770 SHA256 48af177922700c313aa9d22100d230d2d0280d56b8598d80f583d57b44bf63a8
diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
new file mode 100644
index 000000000000..6ce7863fe532
--- /dev/null
+++ b/sys-apps/nawk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<herd>base-system</herd>
+</pkgmetadata>
diff --git a/sys-apps/nawk/nawk-20110810.ebuild b/sys-apps/nawk/nawk-20110810.ebuild
new file mode 100644
index 000000000000..e38ab1d84017
--- /dev/null
+++ b/sys-apps/nawk/nawk-20110810.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20110810.ebuild,v 1.1 2012/06/04 02:31:14 ottxor Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
+HOMEPAGE="http://cm.bell-labs.com/cm/cs/awkbook/index.html"
+SRC_URI="http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/yacc"
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" ALLOC="${LDFLAGS}" YACC=$(type -p yacc)
+}
+
+src_install() {
+	newbin a.out "${PN}"
+	sed -e 's/awk/nawk/g' \
+		-e 's/AWK/NAWK/g' \
+		-e 's/Awk/Nawk/g' \
+		awk.1 > "${PN}".1 || die "manpage patch failed"
+	doman "${PN}".1
+	dodoc README FIXES
+}
diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
index 4a14f5976773..656e66d347df 100644
--- a/sys-cluster/gearmand/Manifest
+++ b/sys-cluster/gearmand/Manifest
@@ -1,3 +1,4 @@
 DIST gearmand-0.12.tar.gz 562096 RMD160 bc55d2f84e3b2deaa71d491fd1ea157b45553802 SHA1 d6115c7041813f5816c0388ce510ff16be155d47 SHA256 c7b818293ade625f0ebaac6b84350e3f4b7e1b2f60b0f345f255064ce9f1d0ec
 DIST gearmand-0.14.tar.gz 559748 RMD160 6b1c305fc830fac8d0eb6493016295bed609a9fe SHA1 11d1a3d530963861e53504582fc17c5184d249b8 SHA256 8e060683dd4b2bfc25a68e22924597ae50bbfd4126966e4088b47c3caa64e25c
 DIST gearmand-0.24.tar.gz 746549 RMD160 8b63c52d32136ffd6298c42bbd33c8aed46a3c0e SHA1 daf38d6f93134002d85f28f664a870696347d2d7 SHA256 cbb14a118cf8e26b5cdc68fade41d07f09f13f52ffed2d9a1c0b431e6838df81
+DIST gearmand-0.33.tar.gz 813193 RMD160 993c48fd7dc8fecefa052cd9a7d2e13945a58ee9 SHA1 94dc8b9eddcdb79ee25aed94f301cda0d57710f6 SHA256 b3f2a0218213a7276b28ce4b6c4b7900f37e0e60123e15494502429b5f78bded
diff --git a/sys-cluster/gearmand/files/gearmand.init.d.2 b/sys-cluster/gearmand/files/gearmand.init.d.2
new file mode 100644
index 000000000000..a3d3b3375824
--- /dev/null
+++ b/sys-cluster/gearmand/files/gearmand.init.d.2
@@ -0,0 +1,78 @@
+#!/sbin/runscript
+# Copyright 2009-2012 Pavel Stratil, senbonzakura.eu
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile=/var/run/gearmand/gearmand.pid
+command=/usr/sbin/gearmand
+
+depend() {
+	use localmount
+
+	case $PERSISTENT in
+	  drizzle)
+	    use drizzle
+	    ;;
+	  memcache)
+	    use memcache
+	    ;;
+	  mysql)
+	    use mysql
+	    ;;
+	  postgre)
+	    use postgresql
+	    ;;
+	  *)
+	    ;;
+	esac
+}
+
+start() {
+	case ${PERSISTENT:-none} in
+	  drizzle|mysql)
+	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libdrizzle"
+            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-host=${PERSISTENT_HOST}"
+            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-user=${PERSISTENT_USER}"
+            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-password=${PERSISTENT_PASS}"
+            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-db=${PERSISTENT_DB}"
+            [ ${PERSISTENT_TABLE}  ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-table=${PERSISTENT_TABLE}"
+            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-port=${PERSISTENT_PORT}"
+            [ ${PERSISTENT_SOCKET} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-uds=${PERSISTENT_SOCKET}"
+            [ ${PERSISTENT} == "mysql" ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-mysql"
+	    ;;
+	  memcache)
+	    [ ${PERSISTENT_SERVERLIST} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libmemcached --libmemcached-servers=${PERSISTENT_SERVERLIST}"
+	    ;;
+	  postgre)
+	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libpq"
+            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-host=${PERSISTENT_HOST}"
+            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-user=${PERSISTENT_USER}"
+            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-password=${PERSISTENT_PASS}"
+            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-dbname=${PERSISTENT_DB}"
+            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-port=${PERSISTENT_PORT}"
+            [ ${PERSISTENT_TABLE}  ] && ewarn "Libpq doesn't recognise 'table' parameter."
+            [ ${PERSISTENT_SOCKET} ] && ewarn "Libpq doesn't recognise 'socket' parameter. If no host is set, it automatically falls back to a socket."
+	    ;;
+	  tokyocabinet)
+	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libtokyocabinet --libtokyocabinet-file=${PERSISTENT_FILE}"
+	    ;;
+	  sqlite)
+	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libsqlite3 --libsqlite3-db=${PERSISTENT_FILE}"
+	    ;;
+          none)
+            ;;
+	  *)
+            eerror "Wrong persistent queue store setting in /etc/conf.d/gearmand."
+	    return 1
+	    ;;
+	esac
+
+
+	checkpath -d -m 0755 -o gearmand:nogroup /var/run/gearmand /var/log/gearmand
+
+	ebegin "Starting ${SVCNAME}"
+        start-stop-daemon --pidfile /var/run/gearmand/gearmand.pid --start \
+		--exec /usr/sbin/gearmand -- --pid-file=/var/run/gearmand/gearmand.pid \
+		--user=gearmand --daemon \
+		--log-file=/var/log/gearmand/gearmand.log ${GEARMAND_PARAMS}
+	eend $?
+}
diff --git a/sys-cluster/gearmand/gearmand-0.33.ebuild b/sys-cluster/gearmand/gearmand-0.33.ebuild
new file mode 100644
index 000000000000..28360de4e481
--- /dev/null
+++ b/sys-cluster/gearmand/gearmand-0.33.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.33.ebuild,v 1.1 2012/06/04 06:56:29 flameeyes Exp $
+
+EAPI=4
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="Generic framework to farm out work to other machines"
+HOMEPAGE="http://www.gearman.org/"
+SRC_URI="http://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tcmalloc +memcache drizzle sqlite tokyocabinet postgres"
+
+RDEPEND="dev-libs/libevent
+	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
+	tcmalloc? ( dev-util/google-perftools )
+	memcache? ( >=dev-libs/libmemcached-0.47 )
+	drizzle? ( dev-db/drizzle )
+	sqlite? ( dev-db/sqlite:3 )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	postgres? ( >=dev-db/postgresql-base-9.0 )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewuser gearmand -1 -1 /dev/null nogroup
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# Don't ever use --enable-assert since configure.ac is broken, and
+	# only does --disable-assert correctly.
+	 if use debug; then
+		# Since --with-debug would turn off optimisations as well as
+		# enabling debug, we just enable debug through the
+		# preprocessor then.
+		append-flags -DDEBUG
+	else
+		myconf="${myconf} --disable-assert"
+	fi
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--disable-mtmalloc \
+		$(use_enable tcmalloc) \
+		$(use_enable memcache libmemcached) \
+		$(use_enable drizzle libdrizzle) \
+		$(use_enable sqlite libsqlite3) \
+		$(use_enable tokyocabinet libtokyocabinet) \
+		$(use_enable postgres libpq)
+}
+
+src_test() {
+	# Since libtool is stupid and doesn't discard /usr/lib64 from the
+	# load path, we'd end up testing against the installed copy of
+	# gearmand (bad).
+	#
+	# We thus cheat and "fix" the scripts by hand.
+	sed -i -e '/LD_LIBRARY_PATH=/s|/usr/lib64:||' "${S}"/tests/*_test \
+		|| die "test fixing failed"
+
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README AUTHORS ChangeLog
+
+	newinitd "${FILESDIR}"/gearmand.init.d.2 gearmand
+	newconfd "${FILESDIR}"/gearmand.conf.d gearmand
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Unless you set the PERSISTENT_TABLE option in"
+	elog "/etc/conf.d/gearmand, Gearmand will use table 'queue'."
+	elog "If such table doesn't exist, Gearmand will create it for you"
+	elog ""
+}
diff --git a/sys-devel/crossdev/crossdev-20120305.ebuild b/sys-devel/crossdev/crossdev-20120305.ebuild
index 8b64ddfee7af..8c71d18ff8b0 100644
--- a/sys-devel/crossdev/crossdev-20120305.ebuild
+++ b/sys-devel/crossdev/crossdev-20120305.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-20120305.ebuild,v 1.1 2012/03/05 23:36:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-20120305.ebuild,v 1.2 2012/06/03 21:08:16 vapier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/gcc-config/gcc-config-1.6.ebuild b/sys-devel/gcc-config/gcc-config-1.6.ebuild
index d6d630a76f5a..b36af5fb70a8 100644
--- a/sys-devel/gcc-config/gcc-config-1.6.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.6.ebuild,v 1.2 2012/03/23 18:04:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.6.ebuild,v 1.3 2012/06/04 08:42:33 ago Exp $
 
 inherit unpacker toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 src_compile() {
diff --git a/sys-devel/gcc/gcc-4.7.0.ebuild b/sys-devel/gcc/gcc-4.7.0.ebuild
index 6618fd6d49c1..ee7b3c0413f0 100644
--- a/sys-devel/gcc/gcc-4.7.0.ebuild
+++ b/sys-devel/gcc/gcc-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.0.ebuild,v 1.3 2012/06/02 19:27:41 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.0.ebuild,v 1.4 2012/06/03 22:59:41 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -43,7 +43,7 @@ src_unpack() {
 	fi
 
 	# drop the x32 stuff once 4.7 goes stable
-	if [[ ${CTARGET} != x86_64* ]] || ! has x32 $(get_all_abis) ; then
+	if [[ ${CTARGET} != x86_64* ]] || ! has x32 $(get_all_abis TARGET) ; then
 		EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
 	fi
 
diff --git a/sys-devel/sparse/sparse-0.4.3.ebuild b/sys-devel/sparse/sparse-0.4.3.ebuild
index c6fb93997362..33246d3fba80 100644
--- a/sys-devel/sparse/sparse-0.4.3.ebuild
+++ b/sys-devel/sparse/sparse-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.3.ebuild,v 1.8 2012/06/02 14:29:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.3.ebuild,v 1.10 2012/06/03 19:30:14 ago Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 LICENSE="OSL-1.1"
diff --git a/sys-fs/s3ql/Manifest b/sys-fs/s3ql/Manifest
index ed3a9e7b1765..c563bf1f0eec 100644
--- a/sys-fs/s3ql/Manifest
+++ b/sys-fs/s3ql/Manifest
@@ -1,3 +1 @@
-DIST s3ql-1.10.tar.bz2 1431744 RMD160 0b175716b2b9cdd23447b4f8c17e3853fc1328b3 SHA1 6321c7d76a264bd40535d6f1186a2ea1a1ca2fda SHA256 eb906919103561fd7a297d8cdbf2f8e35075c5927fa0f967f8d15e154e72d55e
 DIST s3ql-1.11.1.tar.bz2 1434714 RMD160 e12f73b0f475730021ac6d9833bc6325e6980a0d SHA1 d8c0b752ac8aa9376b43a01424a2afd325737162 SHA256 bb1a6bfd19bb4eccb675a0d1a60c5df24b438192efee0c264e0c1fe161828bd8
-DIST s3ql-1.11.tar.bz2 1431445 RMD160 c4280a7c8234b1b5d10217a97bd3f5fac58362b6 SHA1 4d8ff5641323adb3988e97120e27a6c1d8dec453 SHA256 ef2f90821eee463f1e1357edb32faece086113a7f55b2140b4c5b2ba241d2343
diff --git a/sys-fs/s3ql/s3ql-1.10.ebuild b/sys-fs/s3ql/s3ql-1.10.ebuild
deleted file mode 100644
index 3cd02a55fde7..000000000000
--- a/sys-fs/s3ql/s3ql-1.10.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/sys-fs/s3ql/s3ql-1.10.ebuild,v 1.1 2012/02/25 04:12:34 radhermit Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="http://code.google.com/p/s3ql/"
-SRC_URI="http://s3ql.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND="dev-python/setuptools
-	>=dev-python/apsw-3.7.0
-	>=dev-python/llfuse-0.37
-	dev-python/pycryptopp
-	dev-python/pyliblzma
-	|| ( >=dev-lang/python-2.7 dev-python/argparse )
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		net-misc/rsync[xattr]
-		dev-python/unittest2
-	)"
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] ; then
-		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
-	else
-		addwrite /dev/fuse
-		distutils_src_test
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/sys-fs/s3ql/s3ql-1.11.ebuild b/sys-fs/s3ql/s3ql-1.11.ebuild
deleted file mode 100644
index fab7904300c3..000000000000
--- a/sys-fs/s3ql/s3ql-1.11.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/sys-fs/s3ql/s3ql-1.11.ebuild,v 1.1 2012/04/30 04:28:44 radhermit Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="http://code.google.com/p/s3ql/"
-SRC_URI="http://s3ql.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND="dev-python/setuptools
-	>=dev-python/apsw-3.7.0
-	>=dev-python/llfuse-0.37
-	dev-python/pycryptopp
-	dev-python/pyliblzma
-	|| ( >=dev-lang/python-2.7 dev-python/argparse )
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		net-misc/rsync[xattr]
-		dev-python/unittest2
-	)"
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] ; then
-		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
-	else
-		addwrite /dev/fuse
-		distutils_src_test
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild b/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild
index dcba3b2f55da..bdd729428626 100644
--- a/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild,v 1.6 2012/05/26 10:03:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.24_p1.ebuild,v 1.7 2012/06/04 04:29:01 josejx Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -50,7 +50,7 @@ else
 		${COMMON_URI}"
 	# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
 	# Release Engineering, it's easier for us to deal with all arches at once.
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index ec17093985dc..654ccd8d0a90 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,5 @@
 DIST linux-3.3.tar.bz2 78963640 RMD160 2bdb25e5af4549a43d8b202508b85837005146e5 SHA1 dc10fd59e5afbe0f74de06862435dd8bed07ca6a SHA256 8fd669b4e48181b8d44644a45bf421a84bb8d5ec273ef36349796443e442f333
+DIST linux-3.4.tar.bz2 80173484 RMD160 e0bcaa53b6eb3de9498f51b2c8b90d6c52d54889 SHA1 dfc54e7fbee81f77aba85d3d8ff2d992e1e49573 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d
 DIST patch-3.4-rc1.bz2 7477325 RMD160 fa6453fb50db096f27d360a818930f6479cd1de1 SHA1 6dbf728a51d77cef011dd1ca25ca5ad33dd488bb SHA256 0f90ea00624d62d0c202774e75aa0ae4d285db99353f83d4f19e56bbbc40925e
 DIST patch-3.4-rc2.bz2 7652538 RMD160 f91396efe8fc487b698681bdf436199ab55d7de2 SHA1 7788dafcde72ecdaded6024a4d4d48f228fe3e8e SHA256 c7ae7b652f64b47fe451e72f2b36fce581c7ea4cb9b533bbc517ed36cf47a877
 DIST patch-3.4-rc3.bz2 7725570 RMD160 28bcb0edaacad604d870f6f8f8b93ba50ed1a04c SHA1 57a719a5401f0fd77b915f698bad41a49aa547c7 SHA256 a115992359535948485f0f8c0ed8bc6d57459100620f2b8ee712d035374d0bd4
@@ -6,3 +7,4 @@ DIST patch-3.4-rc4.bz2 7756898 RMD160 bbf8c814471e53eb9e047db2bb327cae095d0e0f S
 DIST patch-3.4-rc5.bz2 7831549 RMD160 0a835ba943fc205163b089908955e2088035c30e SHA1 94388542802f6fe61d5d101ec7c5415d861df9a3 SHA256 84376f424688236d52ba76a8d8fbd0a0df176b89e5c384ca415029eb5483d9a0
 DIST patch-3.4-rc6.bz2 7858117 RMD160 11d32fccf54a57f597c458c50df2025786a4e3db SHA1 bd4e900813ea07cb7024c5443ed0d9d34dab76bb SHA256 016c63633f6fe32058c53f124aab2326cecc7333d9fafe5411d31393ff70b86f
 DIST patch-3.4-rc7.bz2 7881421 RMD160 98ef7647f4d6f988b41f5b9eff258bc9f18ee0c8 SHA1 d28cc166149a8cd3dfbd89dc81a47c7ab650fad7 SHA256 5426540a77306b30b2377212ea395334f850305d9122dc6f28f39a364077b284
+DIST patch-3.5-rc1.bz2 7577309 RMD160 476d584b485a8a29e626194ffb34b2ef7e1c1dbf SHA1 aba4cee69c5b1ba5625c6c7d24e809f4872edff3 SHA256 b0dc08600e1575bf988119d1a27691a548c5855fd149b7843af6fc0a76086758
diff --git a/sys-kernel/git-sources/git-sources-3.5_rc1.ebuild b/sys-kernel/git-sources/git-sources-3.5_rc1.ebuild
new file mode 100644
index 000000000000..af7f251b95a3
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-3.5_rc1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.5_rc1.ebuild,v 1.1 2012/06/03 15:10:35 mpagano Exp $
+
+EAPI="4"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE=0
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
index 0850f4567fd2..907cd7907138 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.2 2012/05/28 16:20:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.3 2012/06/03 21:32:58 ago Exp $
 
 EAPI=4
 inherit savedconfig
@@ -17,7 +17,7 @@ DESCRIPTION="Linux firmware files"
 HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
 
 LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~x86"
 SLOT="0"
 IUSE="savedconfig"
 
diff --git a/sys-power/nut/nut-2.6.3.ebuild b/sys-power/nut/nut-2.6.3.ebuild
index d3b46970508d..50f57f10f29a 100644
--- a/sys-power/nut/nut-2.6.3.ebuild
+++ b/sys-power/nut/nut-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.6.3.ebuild,v 1.2 2012/06/02 22:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.6.3.ebuild,v 1.3 2012/06/03 16:16:52 xmw Exp $
 
 EAPI=2
 inherit autotools bash-completion eutils fixheadtails multilib user
@@ -15,7 +15,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi cgi snmp usb ssl tcpd xml"
 
 RDEPEND="avahi? ( net-dns/avahi )
diff --git a/sys-process/time/time-1.7-r1.ebuild b/sys-process/time/time-1.7-r1.ebuild
index d63ab20adb47..b0bfb1a1cc4d 100644
--- a/sys-process/time/time-1.7-r1.ebuild
+++ b/sys-process/time/time-1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/time/time-1.7-r1.ebuild,v 1.6 2010/10/17 03:53:01 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/time/time-1.7-r1.ebuild,v 1.7 2012/06/03 23:28:04 vapier Exp $
+
+EAPI="4"
 
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
 inherit eutils autotools
 
 DESCRIPTION="displays info about resources used by a program"
@@ -15,17 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${PV}-info-dir-entry.patch
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README AUTHORS NEWS
-}
diff --git a/media-radio/ax25-apps/files/ax25rtd.blank b/virtual/awk/Manifest
similarity index 100%
rename from media-radio/ax25-apps/files/ax25rtd.blank
rename to virtual/awk/Manifest
diff --git a/virtual/awk/awk-0.ebuild b/virtual/awk/awk-0.ebuild
new file mode 100644
index 000000000000..570d05bce1bf
--- /dev/null
+++ b/virtual/awk/awk-0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/awk/awk-0.ebuild,v 1.2 2012/06/04 04:57:12 ssuominen Exp $
+
+DESCRIPTION="Virtual for awk implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	|| (
+		sys-apps/gawk
+		sys-apps/mawk
+		sys-apps/nawk
+		sys-apps/busybox
+	)"
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
new file mode 100644
index 000000000000..6ce7863fe532
--- /dev/null
+++ b/virtual/awk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<herd>base-system</herd>
+</pkgmetadata>
diff --git a/www-client/chromium/chromium-21.0.1155.2.ebuild b/www-client/chromium/chromium-21.0.1155.2.ebuild
index 3c7a1defba77..6bd7e9afc916 100644
--- a/www-client/chromium/chromium-21.0.1155.2.ebuild
+++ b/www-client/chromium/chromium-21.0.1155.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.1 2012/05/30 09:56:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.2 2012/06/03 18:01:06 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
+	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
@@ -109,6 +110,9 @@ src_prepare() {
 	sed -i '1i#define OF(x) x' \
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
+	# Unbundle expat, bug #384773.
+	epatch "${FILESDIR}/${PN}-expat-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -117,7 +121,6 @@ src_prepare() {
 		\! -path 'third_party/angle/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
 		\! -path 'third_party/ffmpeg/*' \
 		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/gpsd/*' \
diff --git a/www-client/chromium/files/chromium-expat-r0.patch b/www-client/chromium/files/chromium-expat-r0.patch
new file mode 100644
index 000000000000..16f0fd69e032
--- /dev/null
+++ b/www-client/chromium/files/chromium-expat-r0.patch
@@ -0,0 +1,10 @@
+--- chrome/browser/autofill/autofill_xml_parser.h.orig	2012-06-03 16:45:24.000000000 +0200
++++ chrome/browser/autofill/autofill_xml_parser.h	2012-06-03 16:45:33.000000000 +0200
+@@ -13,7 +13,6 @@
+ #include "base/compiler_specific.h"
+ #include "chrome/browser/autofill/field_types.h"
+ #include "chrome/browser/autofill/form_structure.h"
+-#include "third_party/expat/files/lib/expat.h"
+ #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
+ 
+ // The base class that contains common functionality between
diff --git a/www-servers/tomcat/tomcat-7.0.27.ebuild b/www-servers/tomcat/tomcat-7.0.27.ebuild
index 1a8e3c8c050d..524ebea8ca08 100644
--- a/www-servers/tomcat/tomcat-7.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.27.ebuild,v 1.2 2012/05/02 17:17:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.27.ebuild,v 1.3 2012/06/04 07:32:59 johu Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@ MY_P="apache-${P}-src"
 SLOT="7"
 SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
 IUSE=""
diff --git a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
index 0baab7bd81cd..f2ae3587fcf7 100644
--- a/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.1 2012/05/29 13:29:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild,v 1.2 2012/06/04 08:39:15 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
index 3ba210e43074..daec785c532e 100644
--- a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild,v 1.1 2012/05/23 15:19:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild,v 1.2 2012/06/04 08:41:33 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit xorg-2 multilib versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
index e35c7b6b6420..fbf35a4193cb 100644
--- a/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild,v 1.3 2012/03/05 11:11:25 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild,v 1.4 2012/06/04 00:18:57 xmw Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug doc"
 
 RDEPEND="x11-libs/libXtst"
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
index 56f812fbeb8b..5863ccaaab87 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v 1.4 2012/03/05 11:09:38 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v 1.5 2012/06/04 00:20:42 xmw Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
 IUSE="debug doc jpeg pango png static-libs test truetype X xsettings"
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
index ad58aaa35e03..cf8dfde872c8 100644
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.11 2012/03/05 11:08:17 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.12 2012/06/04 00:21:55 xmw Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug cairo"
 
 DEPEND="x11-libs/libfakekey
diff --git a/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild b/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild
index c5b5e18c8f89..282d6347b021 100644
--- a/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild
+++ b/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild,v 1.10 2012/03/05 11:11:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild,v 1.11 2012/06/04 00:31:47 xmw Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-plugins/asmon/asmon-0.71.ebuild b/x11-plugins/asmon/asmon-0.71.ebuild
index 1f5de6441b18..9fc62c2457e6 100644
--- a/x11-plugins/asmon/asmon-0.71.ebuild
+++ b/x11-plugins/asmon/asmon-0.71.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.71.ebuild,v 1.3 2008/06/27 20:22:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.71.ebuild,v 1.4 2012/06/04 08:42:58 ago Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild b/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild
index 26237ece1ee9..7043c07832cc 100644
--- a/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild
+++ b/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild,v 1.10 2012/03/05 11:14:04 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-input-manager/matchbox-applet-input-manager-0.6.ebuild,v 1.11 2012/06/04 00:33:40 xmw Exp $
 
 inherit versionator eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_ra
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug"
 
 DEPEND=">=x11-libs/libmatchbox-1.5"
diff --git a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild b/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild
index 3cc2d23e1a65..3697de03d56a 100644
--- a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild
+++ b/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild,v 1.10 2012/03/05 11:13:39 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild,v 1.11 2012/06/04 00:34:56 xmw Exp $
 
 inherit eutils versionator
 
@@ -13,7 +13,7 @@ SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_ra
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild b/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild
index 0c2718910a3a..32b44f8b2b01 100644
--- a/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild
+++ b/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild,v 1.10 2012/03/05 11:13:14 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-volume/matchbox-applet-volume-0.1.ebuild,v 1.11 2012/06/04 00:36:04 xmw Exp $
 
 EAPI=1
 
@@ -15,7 +15,7 @@ SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_ra
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild b/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild
index a4d2bbc64840..894c99894499 100644
--- a/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild
+++ b/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild,v 1.7 2010/01/06 00:25:05 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2.ebuild,v 1.8 2012/06/04 00:47:26 xmw Exp $
 
 inherit versionator eutils autotools
 
@@ -13,7 +13,7 @@ SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_ra
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/libmatchbox-1.1"
diff --git a/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild b/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild
index df0a93f88a72..f7573f11cd07 100644
--- a/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild
+++ b/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild,v 1.6 2012/03/05 11:09:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-xine/matchbox-desktop-xine-0.4.ebuild,v 1.7 2012/06/04 01:53:07 xmw Exp $
 
 inherit versionator eutils autotools
 
@@ -13,7 +13,7 @@ SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_ra
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 DEPEND=">=x11-libs/libmatchbox-1.1
diff --git a/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.4.ebuild b/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.4.ebuild
deleted file mode 100644
index 907fe19959a0..000000000000
--- a/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.4.ebuild,v 1.4 2012/05/05 04:10:07 jdhore Exp $
-
-EAPI=2
-
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit gnome2-utils autotools
-
-MY_P=nimbus-${PV}
-
-DESCRIPTION="Nimbus GTK+ Engine from Sun JDS"
-HOMEPAGE="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/"
-SRC_URI="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.6:2"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.1
-	virtual/pkgconfig
-	dev-util/intltool
-	kernel_Interix? ( ${AUTOTOOLS_DEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	echo light-index.theme.in >> po/POTFILES.skip
-	echo dark-index.theme.in >> po/POTFILES.skip
-
-	# Interix needs a full eautoreconf, but don't bother for other archs
-	[[ ${CHOST} == *-interix* ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.7.ebuild b/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.7.ebuild
deleted file mode 100644
index d87884d16ccc..000000000000
--- a/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-nimbus/gtk-engines-nimbus-0.1.7.ebuild,v 1.3 2012/05/05 04:10:07 jdhore Exp $
-
-EAPI=4
-AUTOTOOLS_AUTO_DEPEND=no
-MY_P=nimbus-${PV}
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="A GTK+-2 engine, icon and metacity themes from Sun JDS"
-HOMEPAGE="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/"
-SRC_URI="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.1
-	virtual/pkgconfig
-	dev-util/intltool
-	kernel_Interix? ( ${AUTOTOOLS_DEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog )
-
-src_prepare() {
-	echo light-index.theme.in >> po/POTFILES.skip
-	echo dark-index.theme.in >> po/POTFILES.skip
-
-	# Interix needs a full eautoreconf, but don't bother for other archs
-	[[ ${CHOST} == *-interix* ]] && eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}"usr -name 'libnimbus.la' -exec rm -f {} +
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/gtk-engines-ubuntulooks/Manifest b/x11-themes/gtk-engines-ubuntulooks/Manifest
index 70fd2f784a91..098adb386f3e 100644
--- a/x11-themes/gtk-engines-ubuntulooks/Manifest
+++ b/x11-themes/gtk-engines-ubuntulooks/Manifest
@@ -1,3 +1,2 @@
-DIST ubuntulooks_0.9.12-11.diff.gz 8000 RMD160 b433718ea0cfd19159d416a6b344d7195e7bdd5d SHA1 3db04882a41c8c389f3810eebe534bed580050e7 SHA256 dc508eb0b6d24946f19945fb7b98adffe22f2b22620156c16f376a8f3ed72a60
 DIST ubuntulooks_0.9.12-12.diff.gz 8398 RMD160 3e87221e886dbe80be83f8e217932287efc703b1 SHA1 2d94c856f6c6fc615f43f18f1265124ca8fe5d61 SHA256 ac3675103e3bdd7a032e0a0ed0b959c9b2ed48e6d0d57c9ef73713b9b8233b5f
 DIST ubuntulooks_0.9.12.orig.tar.gz 345833 RMD160 451dc8a093f9c4f78e66065c7daddb8af91db9ff SHA1 7270727e42e5b1a790c1010e784ad29ac4430348 SHA256 88e3535c3c7a12c24b09fb057c2a6b52eb0d13f1b2fbdabb4a13bb7e164877fa
diff --git a/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch b/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch
new file mode 100644
index 000000000000..453407f14ee1
--- /dev/null
+++ b/x11-themes/gtk-engines-ubuntulooks/files/gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/419395
+
+--- engine/src/animation.c
++++ engine/src/animation.c
+@@ -7,7 +7,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
diff --git a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r2.ebuild b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r2.ebuild
deleted file mode 100644
index fa53c149146b..000000000000
--- a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r2.ebuild,v 1.6 2012/05/05 04:10:03 jdhore Exp $
-
-EAPI=2
-inherit eutils
-
-PATCH_LEVEL=11
-
-MY_PN=${PN/gtk-engines-/}
-
-DESCRIPTION="a derivative of the standard Clearlooks engine, using a more orange approach"
-HOMEPAGE="http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks"
-SRC_URI="mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
-	mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch debian/patches
-}
-
-src_configure() {
-	econf --disable-dependency-tracking --enable-animation
-}
-
-src_compile() {
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README
-	newdoc debian/changelog ChangeLog.debian
-}
diff --git a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
index 079d278d313a..e481bba81868 100644
--- a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
+++ b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild,v 1.6 2012/05/05 04:10:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild,v 1.7 2012/06/03 19:57:10 ssuominen Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
+inherit autotools eutils
 
 PATCH_LEVEL=12
-MY_PN=${PN/gtk-engines-/}
+MY_PN=${PN/gtk-engines-}
 
-DESCRIPTION="a derivative of the standard Clearlooks engine, using a more orange approach"
+DESCRIPTION="A derivative of the standard Clearlooks GTK+ 2.x engine with more orange approach"
 HOMEPAGE="http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks"
 SRC_URI="mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
 	mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}-${PATCH_LEVEL}.diff.gz"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.8:2"
+RDEPEND=">=dev-libs/glib-2
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -26,17 +27,19 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 src_prepare() {
 	epatch "${WORKDIR}"/${MY_PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch debian/patches
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch #419395
 
-	eautoreconf # need new libtool for interix
+	eautoreconf # update libtool for interix
 }
 
 src_configure() {
-	econf --disable-dependency-tracking --enable-animation
+	econf --enable-animation
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README
 	newdoc debian/changelog ChangeLog.debian
+	find "${ED}"/usr -name '*.la' -type f -exec rm -f {} +
 }
diff --git a/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild b/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild
index ce7716833591..f473c63e9192 100644
--- a/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild
+++ b/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild,v 1.9 2012/03/05 11:12:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/matchbox-themes-extra/matchbox-themes-extra-0.3.ebuild,v 1.10 2012/06/04 00:28:58 xmw Exp $
 
 inherit versionator
 
@@ -10,7 +10,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-themes/gtk-engines-nimbus/Manifest b/x11-themes/nimbus/Manifest
similarity index 50%
rename from x11-themes/gtk-engines-nimbus/Manifest
rename to x11-themes/nimbus/Manifest
index b18851f02ba4..beee6e08aaae 100644
--- a/x11-themes/gtk-engines-nimbus/Manifest
+++ b/x11-themes/nimbus/Manifest
@@ -1,2 +1 @@
-DIST nimbus-0.1.4.tar.bz2 9571957 RMD160 1a1245ee262c393b6b503196117635b0679572c5 SHA1 c9b4e188816c55726cb1efbf781d94b2190244e3 SHA256 28c668c18852fad296b5f4191bddacba17a03ac8ab59f595c8c7b1483c626537
 DIST nimbus-0.1.7.tar.bz2 9564020 RMD160 b3df6399d41730a98fadfaaff7838de539803f3f SHA1 a8efe891e2cfc418214edb0d3a245b180ff3e2c1 SHA256 29908d25ca6aa9e60f715f38e82ffa8d086c903d5a85c7768e5c7fd5110924ef
diff --git a/x11-themes/gtk-engines-nimbus/metadata.xml b/x11-themes/nimbus/metadata.xml
similarity index 83%
rename from x11-themes/gtk-engines-nimbus/metadata.xml
rename to x11-themes/nimbus/metadata.xml
index 540f810e069d..40838bc36783 100644
--- a/x11-themes/gtk-engines-nimbus/metadata.xml
+++ b/x11-themes/nimbus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+<herd>desktop-misc</herd>
 </pkgmetadata>
diff --git a/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..7ca571fca14c
--- /dev/null
+++ b/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/nimbus/nimbus-0.1.7-r1.ebuild,v 1.1 2012/06/03 23:00:37 ssuominen Exp $
+
+EAPI=4
+AUTOTOOLS_AUTO_DEPEND=no
+inherit autotools gnome2-utils
+
+DESCRIPTION="The default OpenSolaris theme (GTK+ 2.x engine, icon- and metacity theme)"
+HOMEPAGE="http://dlc.sun.com/osol/jds/downloads/extras/nimbus/"
+SRC_URI="http://dlc.sun.com/osol/jds/downloads/extras/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="gtk minimal"
+
+COMMON_DEPEND="gtk? ( x11-libs/gtk+:2 )"
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( || ( x11-themes/gnome-icon-theme x11-themes/tango-icon-theme ) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=x11-misc/icon-naming-utils-0.8.90
+	!gtk? ( ${AUTOTOOLS_DEPEND} )
+	kernel_Interix? ( ${AUTOTOOLS_DEPEND} )"
+
+src_prepare() {
+	# Tango is deprecated
+	sed -i -e '/^Inherits/s:Tango:gnome,&:' icons/index.theme.in || die
+
+	# Encoding= key is obsolete
+	sed -i -e '/^Encoding/d' *.theme.in || die
+
+	use gtk || { sed -i \
+		-e '/^gtk-engine/d' -e '/GTK2/d' -e '/^SUBDIRS/s:gtk-engine ::' \
+		configure.in Makefile.am || die; }
+
+	local f=po/POTFILES.skip
+	echo light-index.theme.in >> ${f}
+	echo dark-index.theme.in >> ${f}
+
+	if [[ ${CHOST} == *-interix* ]] || ! use gtk; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use gtk && echo --disable-static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog
+
+	use gtk && find "${ED}"/usr -name libnimbus.la -exec rm -f {} +
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild b/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
index 0558cd0826c1..567102156888 100644
--- a/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
+++ b/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild,v 1.6 2012/03/05 11:08:42 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild,v 1.7 2012/06/04 00:22:58 xmw Exp $
 
 inherit eutils versionator
 
@@ -10,7 +10,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="pda"
 
 RDEPEND=">=x11-libs/libmatchbox-1.1"
diff --git a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild b/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
index 92cff35b143d..6c536ce8e087 100644
--- a/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
+++ b/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild,v 1.8 2012/03/05 11:07:50 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-desktop/matchbox-desktop-0.9.1.ebuild,v 1.9 2012/06/04 00:31:01 xmw Exp $
 
 inherit versionator
 
@@ -10,7 +10,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug dnotify startup-notification"
 
 DEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild b/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
index 3423cd999c19..a4cef6984964 100644
--- a/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
+++ b/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild,v 1.3 2012/03/05 11:12:23 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild,v 1.4 2012/06/04 00:27:54 xmw Exp $
 
 inherit eutils autotools versionator
 
@@ -10,7 +10,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="acpi debug dnotify lowres nls startup-notification wifi"
 
 DEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild
index cae8023511ee..1624d702564b 100644
--- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild
+++ b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild,v 1.9 2012/03/05 11:11:55 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.2.ebuild,v 1.10 2012/06/04 00:25:35 xmw Exp $
 
 inherit eutils versionator gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="debug expat gnome session startup-notification xcomposite"
 
 RDEPEND=">=x11-libs/libmatchbox-1.5
diff --git a/x11-wm/matchbox/Manifest b/x11-wm/matchbox/Manifest
index 1ad11a8e9db2..e69de29bb2d1 100644
--- a/x11-wm/matchbox/Manifest
+++ b/x11-wm/matchbox/Manifest
@@ -1 +0,0 @@
-DIST matchbox-0.7.1.tar.gz 740758 RMD160 6ab9217d1bbee30540709762d640a220b93afe45 SHA1 5f26a6a83c7f24508f3ff031ec4e7c13d2cad3bd SHA256 ac5a1b26a1d3a1acf23654b039125869306d69bd0226a8255dde2e86574d3cfe
diff --git a/x11-wm/matchbox/matchbox-0.7.1.ebuild b/x11-wm/matchbox/matchbox-0.7.1.ebuild
deleted file mode 100644
index 71126d7eb34f..000000000000
--- a/x11-wm/matchbox/matchbox-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-0.7.1.ebuild,v 1.16 2010/11/08 21:45:49 ssuominen Exp $
-
-inherit flag-o-matic
-
-IUSE="jpeg png nls debug"
-
-DESCRIPTION="Light weight WM designed for use on PDA computers"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://handhelds.org/~mallum/downloadables/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	dev-libs/expat
-	x11-libs/startup-notification
-	x11-libs/libxsettings-client
-	png? ( >=media-libs/libpng-1.4 )
-	jpeg? ( virtual/jpeg )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	sys-devel/libtool"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} --enable-dnotify"
-	myconf="${myconf} --enable-expat"
-	myconf="${myconf} --enable-sn"
-	myconf="${myconf} --enable-xsettings"
-	use nls && myconf="${myconf} --enable-nls"
-	use jpeg && myconf="${myconf} --enable-jpg"
-	use png || myconf="${myconf} --disable-png"
-	use debug && myconf="${myconf} --enable-debug"
-
-	append-ldflags $(no-as-needed)
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make feiled"
-}
-
-src_install() {
-	einstall || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS \
-	      README RELEASE-NOTES-0.7 TODO
-}
diff --git a/x11-wm/matchbox/matchbox-1.0.ebuild b/x11-wm/matchbox/matchbox-1.0.ebuild
index 7fb1f1198288..b2c87253cbc5 100644
--- a/x11-wm/matchbox/matchbox-1.0.ebuild
+++ b/x11-wm/matchbox/matchbox-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-1.0.ebuild,v 1.11 2012/03/05 11:10:31 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-1.0.ebuild,v 1.12 2012/06/04 00:38:11 xmw Exp $
 
 DESCRIPTION="Light weight WM designed for use on PDA computers"
 HOMEPAGE="http://matchbox-project.org/"
@@ -10,7 +10,7 @@ IUSE="minimal"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 
 RDEPEND="x11-wm/matchbox-common
 	x11-wm/matchbox-desktop